From 57c32722bedfff421cc044dbd39c0b0d648b7e5e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sat, 13 Dec 2014 04:39:30 -0600
Subject: [PATCH] Set the pip timeout globally for Travis

Conflicts:
	.travis.yml
---
 .travis.yml           | 1 +
 tools/travis_setup.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b49b8a88..353f01bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ before_install:
     - export PYTHONWARNINGS="all"
     - export WHEELHOUSE="--no-index --find-links=http://travis-wheels.scikit-image.org/"
     - export TEST_ARGS="--exe --ignore-files=^_test -v --with-doctest --ignore-files=^setup.py$"
+    - export PIP_DEFAULT_TIMEOUT=60
     - sudo apt-get update
 
     - travis_retry tools/travis_setup.sh
diff --git a/tools/travis_setup.sh b/tools/travis_setup.sh
index 5b841490..7eee56cf 100755
--- a/tools/travis_setup.sh
+++ b/tools/travis_setup.sh
@@ -24,7 +24,7 @@ if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then
     sed -i 's/matplotlib>=*.*.*/matplotlib==1.3.1/g' requirements.txt
 fi
 
-pip install --timeout 60 $WHEELHOUSE -r requirements.txt
+pip install $WHEELHOUSE -r requirements.txt
 
 # clean up disk space
 sudo apt-get clean