From ae564475375dd6ec8acf7fa10e6ea4758f91803d Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 17 Jan 2019 12:32:40 +0000 Subject: [PATCH 1/3] Add xvfb service to travis --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3a8c2114552..5018bb72438a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ language: python dist: xenial sudo: false +services: + - xvfb + branches: except: - /^auto-backport-of-pr-\d*/ @@ -156,10 +159,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 From c129091dcbfcd0e36cd9b2d21cfa6a37a3dec5e6 Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux Date: Thu, 17 Jan 2019 21:49:53 -0800 Subject: [PATCH 2/3] TST downgrading pytest --- .appveyor.yml | 2 +- requirements/testing/travis_all.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a04d3d14e3ad..90dd8d11547c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt index 364e43fd8875..dcffd281ee1c 100644 --- a/requirements/testing/travis_all.txt +++ b/requirements/testing/travis_all.txt @@ -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 From dcfe1534e544f6f275bea2a74176d4401c7c3d62 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 18 Jan 2019 17:32:46 -0500 Subject: [PATCH 3/3] CI: do not pull py35 test run back to trusty This is to make sure we have the xvfb as a service --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5018bb72438a..3893843c646d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,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