From f8b8be427d61e95ae4531ec3fcdacb1a41e6ee4d Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 13 Jul 2015 21:44:27 -0500 Subject: [PATCH 1/2] Travis: Upgrade pip and setuptools The installed version has issues with mock --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index f1054a4a0b60..4100090d0259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,11 @@ before_install: - source venv/bin/activate install: + # Upgrade pip and setuptools. Mock has issues with the default version of + # setuptools + - | + pip install --upgrade pip + pip install --upgrade setuptools # Install only from travis wheelhouse - if [ -z "$PRE" ]; then wheelhouse_pip_install python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0; From 79631d1d24dd294e67a4c2f8e0d835a9b931e480 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 13 Jul 2015 22:05:34 -0500 Subject: [PATCH 2/2] Trust travis whell house Needed to work with new versions of pip --- tools/travis_tools.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/travis_tools.sh b/tools/travis_tools.sh index f9fec988ddc6..0710891430d1 100644 --- a/tools/travis_tools.sh +++ b/tools/travis_tools.sh @@ -1,5 +1,6 @@ # Tools for working with travis-ci -export WHEELHOUSE="http://travis-wheels.scikit-image.org/" +export WHEELHOST="travis-wheels.scikit-image.org" +export WHEELHOUSE="http://${WHEELHOST}/" retry () { # https://gist.github.com/fungusakafungus/1026804 @@ -21,5 +22,5 @@ retry () { wheelhouse_pip_install() { # Install pip requirements via travis wheelhouse - retry pip install --timeout=60 --no-index --find-links $WHEELHOUSE $@ + retry pip install --timeout=60 --no-index --trusted-host $WHEELHOST --find-links $WHEELHOUSE $@ }