File tree Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -66,7 +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.4" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
69
+ - pip install -q "pytest>=3.4,<4.0 " "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
70
70
71
71
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
72
72
# https://github.com/matplotlib/matplotlib/issues/9176
Original file line number Diff line number Diff line change @@ -3,6 +3,9 @@ language: python
3
3
dist : xenial
4
4
sudo : false
5
5
6
+ services :
7
+ - xvfb
8
+
6
9
branches :
7
10
except :
8
11
- /^auto-backport-of-pr-\d*/
@@ -76,8 +79,6 @@ matrix:
76
79
- RUN_FLAKE8=1
77
80
- EXTRAREQS='-r requirements/testing/travis_flake8.txt'
78
81
- python : 3.5
79
- dist : trusty
80
- # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
81
82
env :
82
83
- PINNEDVERS='-c requirements/testing/travis35.txt'
83
84
- python : 3.6
@@ -156,10 +157,6 @@ install:
156
157
python -mpip install -ve .
157
158
158
159
before_script : |
159
- if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
160
- export DISPLAY=:99.0
161
- sh -e /etc/init.d/xvfb start
162
- fi
163
160
if [[ $DELETE_FONT_CACHE == 1 ]]; then
164
161
rm -rf ~/.cache/matplotlib
165
162
fi
Original file line number Diff line number Diff line change 8
8
pyparsing
9
9
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
10
10
# still supported; this is tested by the first travis python 3.5 build
11
- pytest>=3.6
11
+ pytest>=3.6,<4
12
12
pytest-cov
13
13
pytest-faulthandler
14
14
pytest-rerunfailures
You can’t perform that action at this time.
0 commit comments