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 4cdc2ba

Browse filesBrowse files
jklymakjklymak
authored
Merge pull request #13141 from anntzer/pytest41
Unpin pytest (pytest-cov's latest release is compatible with it).
2 parents 6c0bc66 + c561975 commit 4cdc2ba
Copy full SHA for 4cdc2ba

File tree

Expand file treeCollapse file tree

2 files changed

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

2 files changed

+2
-2
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ install:
6565
- activate test-environment
6666
- echo %PYTHON_VERSION% %TARGET_ARCH%
6767
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
68-
- pip install -q "pytest>=3.4,<4.1" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
68+
- pip install -q "pytest>=3.4" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
6969

7070
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
7171
# 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-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cycler
66
numpy
77
pillow
88
pyparsing
9-
pytest<4.1
9+
pytest
1010
pytest-cov
1111
pytest-faulthandler
1212
pytest-rerunfailures

0 commit comments

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