From 8d04db3bec43bdff904c05bd119e44425e28ab28 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 4 Sep 2015 08:29:52 -0500 Subject: [PATCH] Do not try optional dependencies on Py3.2 --- optional_requirements.txt | 4 ++-- tools/travis_script.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/optional_requirements.txt b/optional_requirements.txt index 8c491b58..2d41f2d1 100644 --- a/optional_requirements.txt +++ b/optional_requirements.txt @@ -1,6 +1,6 @@ PySide; python_version != '2.7' -imread; python_version != '2.7' and python_version != '3.2' -SimpleITK; python_version != '3.2' and python_version != '3.4' +imread; python_version != '2.7' +SimpleITK; python_version != '3.4' astropy tifffile imageio diff --git a/tools/travis_script.sh b/tools/travis_script.sh index efa3071e..fafe1537 100755 --- a/tools/travis_script.sh +++ b/tools/travis_script.sh @@ -21,7 +21,9 @@ section_end "Flake8.test" section "Install.optional.dependencies" # Install most of the optional packages -pip install --retries 3 -q -r ./optional_requirements.txt $WHEELHOUSE +if [[ $PY != 3.2* ]]; then + pip install --retries 3 -q -r ./optional_requirements.txt $WHEELHOUSE +fi # Install Qt and then update the Matplotlib settings if [[ $PY == 2.7* ]]; then