8000 Merge pull request #9878 from jklymak/tst-fix-pytest-appveyor · matplotlib/matplotlib@715cfa6 · GitHub
[go: up one dir, main page]

Skip to content

Commit 715cfa6

Browse files
authored
Merge pull request #9878 from jklymak/tst-fix-pytest-appveyor
TST: Lock pytest to 3.2.5 until 3.3.1 released
2 parents 2f897dc + e39a03a commit 715cfa6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +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 "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
69+
- pip install -q "pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
7070

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

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ install:
136136
137137
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
138138
pip install $PRE \
139-
pytest \
139+
pytest!=3.3.0 \
140140
pytest-cov>=2.3.1 \
141141
pytest-faulthandler \
142142
pytest-rerunfailures \

0 commit comments

Comments
 (0)
0