diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh index 2dcb6d20d30..41727cd7644 100755 --- a/tools/travis_before_install.sh +++ b/tools/travis_before_install.sh @@ -4,6 +4,10 @@ set -ex export WHEELHOUSE="--no-index --find-links=http://travis-wheels.scikit-image.org/" export COVERALLS_REPO_TOKEN=7LdFN9232ZbSY3oaXHbQIzLazrSf6w2pQ export PIP_DEFAULT_TIMEOUT=60 +sh -e /etc/init.d/xvfb start +export DISPLAY=:99.0 +export PYTHONWARNINGS="all" +export TEST_ARGS="--exe --ignore-files=^_test -v --with-doctest --ignore-files=^setup.py$" retry () { diff --git a/tools/travis_script.sh b/tools/travis_script.sh index fad0d2a6d2c..f76467bbe4f 100755 --- a/tools/travis_script.sh +++ b/tools/travis_script.sh @@ -1,14 +1,6 @@ #!/usr/bin/env bash set -ex -section "Script.Setup" -sh -e /etc/init.d/xvfb start -export DISPLAY=:99.0 -PYTHONWARNINGS="all" -TEST_ARGS="--exe --ignore-files=^_test -v --with-doctest --ignore-files=^setup.py$" -section_end "Script.Setup" - - section "Test.with.min.requirements" nosetests $TEST_ARGS skimage section_end "Test.with.min.requirements"