From b6f775a7cf8c775d89e8fe203cd2e0f874be5965 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Wed, 15 Oct 2014 06:03:11 -0500
Subject: [PATCH] Use new wheels site and do not install tifffile until
 optional

---
 .travis.yml                      | 2 +-
 tools/travis_install_optional.sh | 2 ++
 tools/travis_setup.sh            | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7a0e2b94..fb99c279 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ python:
 before_install:
     - export DISPLAY=:99.0
     - export PYTHONWARNINGS="all"
-    - export WHEELHOUSE="--no-index --find-links=http://wheels.scikit-image.org/"
+    - export WHEELHOUSE="--no-index --find-links=http://travis-wheels.scikit-image.org/"
     - travis_retry tools/travis_setup.sh
 
 install:
diff --git a/tools/travis_install_optional.sh b/tools/travis_install_optional.sh
index a373cc6a..9ecb9d20 100755
--- a/tools/travis_install_optional.sh
+++ b/tools/travis_install_optional.sh
@@ -30,3 +30,5 @@ pip install astropy
 if [[ $TRAVIS_PYTHON_VERSION == 2.* ]]; then
     pip install pyamg
 fi
+
+pip install tifffile
diff --git a/tools/travis_setup.sh b/tools/travis_setup.sh
index cefe3a73..f3caaa5e 100755
--- a/tools/travis_setup.sh
+++ b/tools/travis_setup.sh
@@ -15,8 +15,6 @@ if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then
     pip install https://github.com/networkx/networkx/archive/networkx-1.8.tar.gz
 fi
 
-pip install $WHEELHOUSE numpy
-pip install tifffile
 pip install -r requirements.txt $WHEELHOUSE
 python check_bento_build.py