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 e43acae

Browse filesBrowse files
authored
Merge pull request #13159 from matplotlib/revert-12878-fix-pytest-error-in-ci
Revert "Pin pytest to <3.8 (for 3.0.x)"
2 parents 0f5f54f + c19b364 commit e43acae
Copy full SHA for e43acae

File tree

Expand file treeCollapse file tree

2 files changed

+2
-4
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-4
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ 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.4,<3.8" "pytest-cov>=2.3.1" pytest-rerunfailures
70-
pytest-timeout pytest-xdist
69+
- pip install -q "pytest>=3.4" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
7170

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

‎requirements/testing/travis_all.txt

Copy file name to clipboardExpand all lines: requirements/testing/travis_all.txt
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ pillow
88
pyparsing
99
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
1010
# still supported; this is tested by the first travis python 3.5 build
11-
# pytest>=3.8 throws RemovedInPytest4Warning (github #12825)
12-
pytest>=3.6,<3.8
11+
pytest>=3.6
1312
pytest-cov
1413
pytest-faulthandler
1514
pytest-rerunfailures

0 commit comments

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