Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8482916

Browse filesBrowse files
authored
Merge pull request #12879 from timhoffm/fix-pytest-error-in-ci-2.2.x
CI: Pin pytest to <3.8 (for 2.2.x)
2 parents 7c67116 + d7e3789 commit 8482916
Copy full SHA for 8482916

File tree

Expand file treeCollapse file tree

2 files changed

+6
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-3
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ install:
6666
- activate test-environment
6767
- echo %PYTHON_VERSION% %TARGET_ARCH%
6868
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
69-
- pip install -q "pytest!=3.3.0,>=3.2.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
69+
- pip install -q "pytest!=3.3.0,>=3.2.0,<3.8" "pytest-cov>=2.3.1"
70+
pytest-rerunfailures pytest-timeout pytest-xdist
7071

7172
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
7273
# https://github.com/matplotlib/matplotlib/issues/9176

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ env:
5555
- PYPARSING=pyparsing
5656
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.1 is
5757
# still supported; this is tested by the first matrix entry.
58-
- PYTEST='pytest>=3.6'
58+
- PYTEST='pytest>=3.6,<3.8'
5959
- PYTEST_COV=pytest-cov
60+
- PYTEST_RERUNFAILURES=pytest-rerunfailures
6061
- PYTEST_PEP8=
6162
- PYTEST_TIMEOUT=pytest-timeout
6263
- SPHINX=sphinx
@@ -82,6 +83,7 @@ matrix:
8283
- PYTEST=pytest==3.1.0
8384
- PYTEST_COV=pytest-cov==2.3.1
8485
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4.
86+
- PYTEST_RERUNFAILURES='pytest-rerunfailures<5' # 5 needs pytest>=3.6
8587
- SPHINX=sphinx==1.3
8688
- python: 3.4
8789
env: PYTHON_ARGS=-OO
@@ -177,7 +179,7 @@ install:
177179
$PYTEST_COV \
178180
pytest-faulthandler \
179181
$PYTEST_PEP8 \
180-
pytest-rerunfailures \
182+
$PYTEST_RERUNFAILURES \
181183
$PYTEST_TIMEOUT \
182184
pytest-xdist
183185

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.