From 0d9987e2b3015062313f6b6441d48c84ab4043e2 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 2 Oct 2015 20:10:07 -0500
Subject: [PATCH 1/3] Test against Python 3.5 on Travis

Add a test against py35

Restore PySide install for 3.5

Do not try and install simpleitk on py35

Fix syntax in optional requirements file

Allow simpleitk on python 3.4

Do not try simpleitk on py3.4
---
 .travis.yml               | 1 +
 optional_requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 17a91baf..eecd0ff4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ python:
   - 3.2
   - 3.3
   - 3.4
+  - 3.5
 
 before_install:
     - ccache -s
diff --git a/optional_requirements.txt b/optional_requirements.txt
index 6dff92af..7b0fead5 100644
--- a/optional_requirements.txt
+++ b/optional_requirements.txt
@@ -1,6 +1,6 @@
 PySide; python_version != '2.7'
 imread; python_version != '2.7'
-SimpleITK; python_version != '3.4'
+SimpleITK; python_version != '3.4' and python_version != '3.5'
 astropy
 tifffile
 imageio; python_version != '2.6'

From 730297def6f862ab6d851387e7c80033fefd2802 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sat, 3 Oct 2015 13:04:05 -0500
Subject: [PATCH 2/3] Use Dask 0.7.1 on Python 3.2

Try dask 0.7.2

Try dask 0.7.1

Fix comment
---
 tools/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh
index 09f67451..28d825eb 100755
--- a/tools/travis_before_install.sh
+++ b/tools/travis_before_install.sh
@@ -52,9 +52,10 @@ source ~/venv/bin/activate
 pip install --upgrade pip
 pip install --retries 3 -q wheel flake8 coveralls nose
 
-# on Python 3.2, use matplotlib 1.3.1
+# on Python 3.2, use older versions of matplotlib and dask
 if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then
     sed -i 's/matplotlib>=.*/matplotlib==1.3.1/g' requirements.txt
+    sed -i 's/dask.*>=.*/dask[array]==0.7.1/g' requirements.txt
 fi
 
 # install wheels

From 4ccf7787a37555389b3896ad34ed8c3cc21d3984 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Tue, 6 Oct 2015 19:02:37 -0500
Subject: [PATCH 3/3] Remove 3.2 from travis build

---
 .travis.yml                    | 1 -
 tools/travis_before_install.sh | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eecd0ff4..d3c10f2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,6 @@ notifications:
 python:
   - 2.6
   - 2.7
-  - 3.2
   - 3.3
   - 3.4
   - 3.5
diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh
index 28d825eb..159fc2d3 100755
--- a/tools/travis_before_install.sh
+++ b/tools/travis_before_install.sh
@@ -52,12 +52,6 @@ source ~/venv/bin/activate
 pip install --upgrade pip
 pip install --retries 3 -q wheel flake8 coveralls nose
 
-# on Python 3.2, use older versions of matplotlib and dask
-if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then
-    sed -i 's/matplotlib>=.*/matplotlib==1.3.1/g' requirements.txt
-    sed -i 's/dask.*>=.*/dask[array]==0.7.1/g' requirements.txt
-fi
-
 # install wheels
 for requirement in $WHEELBINARIES; do
     WHEELS="$WHEELS $(grep $requirement requirements.txt)"