From 80edc0ef6641d7bd9c6e1f0475ce99ee71bd833b Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Wed, 10 Dec 2014 20:19:47 -0600
Subject: [PATCH] Move the virtual framebuffer to top level yaml

---
 .travis.yml           | 1 +
 tools/travis_setup.sh | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 249cb3ce..436cefe2 100644
--- a/.travis.yml
+++ b/.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
diff --git a/tools/travis_setup.sh b/tools/travis_setup.sh
index 5b91a976..7eee56cf 100755
--- a/tools/travis_setup.sh
+++ b/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