Merge pull request #1294 from blink1073/streamline-travis

Reinstate pip timeout in the Travis-CI build

tools/travis_before_install.sh

@@ -3,6 +3,11 @@ 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 () {

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"