Shuffle some commands back to before_install

scikit-image · Dec 14, 2014 · b14fa31 · b14fa31
1 parent c795948
commit b14fa31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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"