File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed
Filter options
Expand file tree Collapse file tree 2 files changed +3
-6
lines changed
Original file line number Diff line number Diff line change @@ -66,8 +66,7 @@ install:
66
66
- activate test-environment
67
67
- echo %PYTHON_VERSION% %TARGET_ARCH%
68
68
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
69
- - pip install -q "pytest>=3.6.0,<3.8" "pytest-cov>=2.3.1"
70
- pytest-rerunfailures pytest-timeout pytest-xdist
69
+ - pip install -q "pytest>=3.6.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
71
70
72
71
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
73
72
# https://github.com/matplotlib/matplotlib/issues/9176
Original file line number Diff line number Diff line change 53
53
- PANDAS=
54
54
- PILLOW=pillow
55
55
- PYPARSING=pyparsing
56
- - PYTEST='pytest>=3.6,<3.8 '
56
+ - PYTEST='pytest>=3.6'
57
57
- PYTEST_COV=pytest-cov
58
- - PYTEST_RERUNFAILURES=pytest-rerunfailures
59
58
- PYTEST_PEP8=
60
59
- PYTEST_TIMEOUT=pytest-timeout
61
60
- SPHINX=sphinx
@@ -81,7 +80,6 @@ matrix:
81
80
- PYTEST=pytest==3.6.0
82
81
- PYTEST_COV=pytest-cov==2.3.1
83
82
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4.
84
- - PYTEST_RERUNFAILURES='pytest-rerunfailures<5' # 5 needs pytest>=3.6
85
83
- SPHINX=sphinx==1.3
86
84
- python : 3.4
87
85
env : PYTHON_ARGS=-OO
@@ -177,7 +175,7 @@ install:
177
175
$PYTEST_COV \
178
176
pytest-faulthandler \
179
177
$PYTEST_PEP8 \
180
- $PYTEST_RERUNFAILURES \
178
+ pytest-rerunfailures \
181
179
$PYTEST_TIMEOUT \
182
180
pytest-xdist
183
181
You can’t perform that action at this time.
0 commit comments