Commitd2736de

authored

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

This reverts commit4a63ccb.

1 parent4a63ccb commitd2736deCopy full SHA for d2736de

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

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,<4.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist`
	`69`	`+ -pip install -q "pytest>=3.4" "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`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ language: python`
`3`	`3`	`dist:xenial`
`4`	`4`	`sudo:false`
`5`	`5`
`6`		`-services:`
`7`		`- -xvfb`
`8`		`-`
`9`	`6`	`branches:`
`10`	`7`	`except:`
`11`	`8`	`-/^auto-backport-of-pr-\d*/`
`@@ -79,6 +76,8 @@ matrix:`
`79`	`76`	`-RUN_FLAKE8=1`
`80`	`77`	`-EXTRAREQS='-r requirements/testing/travis_flake8.txt'`
`81`	`78`	`-python:3.5`
	`79`	`+dist:trusty`
	`80`	`+# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.`
`82`	`81`	`env:`
`83`	`82`	`-PINNEDVERS='-c requirements/testing/travis35.txt'`
`84`	`83`	`-python:3.6`
`@@ -157,6 +156,10 @@ install:`
`157`	`156`	`python -mpip install -ve .`
`158`	`157`
`159`	`158`	`before_script:\|`
	`159`	`+ if [[ $TRAVIS_OS_NAME != 'osx' ]]; then`
	`160`	`+ export DISPLAY=:99.0`
	`161`	`+ sh -e /etc/init.d/xvfb start`
	`162`	`+ fi`
`160`	`163`	`if [[ $DELETE_FONT_CACHE == 1 ]]; then`
`161`	`164`	`rm -rf ~/.cache/matplotlib`
`162`	`165`	`fi`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pillow`
`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,<4`
	`11`	`+pytest>=3.6`
`12`	`12`	`pytest-cov`
`13`	`13`	`pytest-faulthandler`
`14`	`14`	`pytest-rerunfailures`

Comments

(0)