Merge pull request #1267 from blink1073/fix-travis-retry

Travis-CI: launch the virtual framebuffer from the top level yaml

.travis.yml

@@ -24,6 +24,7 @@ python:
 
 before_install:
     - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
     - export PYTHONWARNINGS="all"
     - export WHEELHOUSE="--no-index --find-links=http://travis-wheels.scikit-image.org/"
     - sudo apt-get update

tools/travis_setup.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -ex
 
-sh -e /etc/init.d/xvfb start
-
 # on Python 2.7, use the system versions of numpy, scipy, and matplotlib
 # and the minimum version of cython and networkx
 if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then