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

Browse filesBrowse files
NelleVtimhoffm
NelleV
authored and
timhoffm
committed
Backport #13205 on branch v3.0.x (Add xvfb service to travis) (#13216)
* Add xvfb service to travis * TST downgrading pytest * CI: do not pull py35 test run back to trusty This is to make sure we have the xvfb as a service
1 parent 73a7c0c commit 4a63ccb
Copy full SHA for 4a63ccb

File tree

Expand file treeCollapse file tree

3 files changed

+5
-8
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+5
-8
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
@@ -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>=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
7070

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

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+3-6Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ language: python
33
dist: xenial
44
sudo: false
55

6+
services:
7+
- xvfb
8+
69
branches:
710
except:
811
- /^auto-backport-of-pr-\d*/
@@ -76,8 +79,6 @@ matrix:
7679
- RUN_FLAKE8=1
7780
- EXTRAREQS='-r requirements/testing/travis_flake8.txt'
7881
- python: 3.5
79-
dist: trusty
80-
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
8182
env:
8283
- PINNEDVERS='-c requirements/testing/travis35.txt'
8384
- python: 3.6
@@ -156,10 +157,6 @@ install:
156157
python -mpip install -ve .
157158
158159
before_script: |
159-
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
160-
export DISPLAY=:99.0
161-
sh -e /etc/init.d/xvfb start
162-
fi
163160
if [[ $DELETE_FONT_CACHE == 1 ]]; then
164161
rm -rf ~/.cache/matplotlib
165162
fi

‎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
@@ -8,7 +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.6
11+
pytest>=3.6,<4
1212
pytest-cov
1313
pytest-faulthandler
1414
pytest-rerunfailures

0 commit comments

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