Skip to content

Backport #13205 on branch v3.0.x (Add xvfb service to travis) #13216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 19, 2019
Merged

Backport #13205 on branch v3.0.x (Add xvfb service to travis) #13216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae56447
Add xvfb service to travis
dstansby Jan 17, 2019
c129091
TST downgrading pytest
NelleV Jan 18, 2019
dcfe153
CI: do not pull py35 test run back to trusty
tacaswell Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ install:
- activate test-environment
- echo %PYTHON_VERSION% %TARGET_ARCH%
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
- pip install -q "pytest>=3.4" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
- pip install -q "pytest>=3.4,<4.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist

# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
# https://github.com/matplotlib/matplotlib/issues/9176
Expand Down
9 changes: 3 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ language: python
dist: xenial
sudo: false

services:
- xvfb

branches:
except:
- /^auto-backport-of-pr-\d*/
Expand Down Expand Up @@ -76,8 +79,6 @@ matrix:
- RUN_FLAKE8=1
- EXTRAREQS='-r requirements/testing/travis_flake8.txt'
- python: 3.5
dist: trusty
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
env:
- PINNEDVERS='-c requirements/testing/travis35.txt'
- python: 3.6
Expand Down Expand Up @@ -156,10 +157,6 @@ install:
python -mpip install -ve .

before_script: |
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
fi
if [[ $DELETE_FONT_CACHE == 1 ]]; then
rm -rf ~/.cache/matplotlib
fi
Expand Down
2 changes: 1 addition & 1 deletion requirements/testing/travis_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pillow
pyparsing
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
# still supported; this is tested by the first travis python 3.5 build
pytest>=3.6
pytest>=3.6,<4
pytest-cov
pytest-faulthandler
pytest-rerunfailures
Expand Down