From b10548509d2157ffe4044b8420e87e790745b52c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 13 Dec 2014 06:19:04 -0600 Subject: [PATCH 1/3] Do not try and install SimpleITK on Py3.2 or 3.4 --- tools/travis_install_optional.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/travis_install_optional.sh b/tools/travis_install_optional.sh index 2d099e3e..9da37bb9 100755 --- a/tools/travis_install_optional.sh +++ b/tools/travis_install_optional.sh @@ -33,8 +33,10 @@ if [[ $TRAVIS_PYTHON_VERSION != 3.2 ]]; then pip install -q imread fi -# Install SimpleITK from wheelhouse if available -pip install -q SimpleITK $WHEELHOUSE; true +# Install SimpleITK from wheelhouse if available (not 3.2 or 3.4) +if [[ ($TRAVIS_PYTHON_VERSION =~ 3\.[24] ]]; then + pip install -q SimpleITK $WHEELHOUSE +fi sudo apt-get install -q libfreeimage3 pip install -q astropy $WHEELHOUSE From 94dab0d30e4984da1fc4a0f7c6d08b274264f2c3 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 13 Dec 2014 06:22:39 -0600 Subject: [PATCH 2/3] Fix boolean logic for SimpleITK install and add warning --- tools/travis_install_optional.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/travis_install_optional.sh b/tools/travis_install_optional.sh index 9da37bb9..989b9d95 100755 --- a/tools/travis_install_optional.sh +++ b/tools/travis_install_optional.sh @@ -35,6 +35,8 @@ fi # Install SimpleITK from wheelhouse if available (not 3.2 or 3.4) if [[ ($TRAVIS_PYTHON_VERSION =~ 3\.[24] ]]; then + echo "SimpleITK unavailable on $TRAVIS_PYTHON_VERSION" +else pip install -q SimpleITK $WHEELHOUSE fi From 04a5b6284735074d2522df2b43bdd041881122ae Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 13 Dec 2014 07:11:40 -0600 Subject: [PATCH 3/3] Fix typo in bash conditional --- tools/travis_install_optional.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis_install_optional.sh b/tools/travis_install_optional.sh index 989b9d95..4b544a33 100755 --- a/tools/travis_install_optional.sh +++ b/tools/travis_install_optional.sh @@ -34,7 +34,7 @@ if [[ $TRAVIS_PYTHON_VERSION != 3.2 ]]; then fi # Install SimpleITK from wheelhouse if available (not 3.2 or 3.4) -if [[ ($TRAVIS_PYTHON_VERSION =~ 3\.[24] ]]; then +if [[ $TRAVIS_PYTHON_VERSION =~ 3\.[24] ]]; then echo "SimpleITK unavailable on $TRAVIS_PYTHON_VERSION" else pip install -q SimpleITK $WHEELHOUSE