diff --git a/.travis.yml b/.travis.yml index ac551dc5..2b6451ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,6 @@ python: - 3.4 before_install: - - sh -e /etc/init.d/xvfb start - - export DISPLAY=:99.0 - - sudo apt-get update - - - export WHEELHOUSE="--no-index --find-links=http://wheels.scikit-image.org/" - - export PYTHONWARNINGS="all" - tools/travis_setup.sh install: diff --git a/tools/travis_setup.sh b/tools/travis_setup.sh index a542a0ec..f7602aef 100755 --- a/tools/travis_setup.sh +++ b/tools/travis_setup.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash set -ex +sh -e /etc/init.d/xvfb start +sudo apt-get update + +WHEELHOUSE="--no-index --find-links=http://wheels.scikit-image.org/" + pip install wheel flake8 coveralls nose pip uninstall -y numpy diff --git a/tools/travis_test.sh b/tools/travis_test.sh index 8af29582..62cfe948 100755 --- a/tools/travis_test.sh +++ b/tools/travis_test.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash set -ex +export DISPLAY=:99.0 +export PYTHONWARNINGS="all" +WHEELHOUSE="--no-index --find-links=http://wheels.scikit-image.org/" + tools/header.py "Run all tests with minimum dependencies" nosetests --exe -v skimage