From 93f21e4e7cc1dce69990016dd0f839ed87cd2650 Mon Sep 17 00:00:00 2001
From: arokem <arokem@gmail.com>
Date: Wed, 13 Apr 2016 07:49:24 -0700
Subject: [PATCH 1/4] TST: Add testing on Python 3.5 on Appveyor.

---
 appveyor.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index c20dabdac8..09eb2c6d7c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,10 @@ environment:
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python35-conda64"
+      PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "64"
+
 install:
   # Install miniconda Python
   - "powershell ./tools/install_python.ps1"

From 4f3ba3460e1ccf89073fa7e729508692afa17fa9 Mon Sep 17 00:00:00 2001
From: arokem <arokem@gmail.com>
Date: Thu, 14 Apr 2016 09:29:13 -0700
Subject: [PATCH 2/4] Explicitly create a conda environment for the test,
 specify Python version.

---
 appveyor.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 09eb2c6d7c..dc7f3cab8b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,6 +35,10 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
   # Install the dependencies of the project.
+  - conda update -q conda
+  - conda info -a
+  - conda create -q -n test-environment python=%PYTHON_VERSION%
+  - activate test-environment
   - "conda install --yes --quiet numpy scipy matplotlib nose h5py"
   - "pip install pydicom"
   - "python setup.py install"

From 6120da294a63a20300b46e7fc0a38663f9cf14b5 Mon Sep 17 00:00:00 2001
From: arokem <arokem@gmail.com>
Date: Thu, 14 Apr 2016 09:44:31 -0700
Subject: [PATCH 3/4] Separate things out a bit, set always-yes for conda.

---
 appveyor.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index dc7f3cab8b..dc1189baef 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,15 +30,18 @@ install:
   # the parent CMD process).
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
 
+  # Set up a conda environment:
+  - conda config --set always_yes yes
+  - conda update -q conda
+  - conda info -a
+  - conda create -q -n test-environment python=%PYTHON_VERSION%
+  - activate test-environment
+
   # Check that we have the expected version and architecture for Python
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
   # Install the dependencies of the project.
-  - conda update -q conda
-  - conda info -a
-  - conda create -q -n test-environment python=%PYTHON_VERSION%
-  - activate test-environment
   - "conda install --yes --quiet numpy scipy matplotlib nose h5py"
   - "pip install pydicom"
   - "python setup.py install"

From 63c8a49dcaf88b7be9b6f9358c1acc863ae2f4d9 Mon Sep 17 00:00:00 2001
From: arokem <arokem@gmail.com>
Date: Thu, 14 Apr 2016 18:06:36 -0700
Subject: [PATCH 4/4] Test on Python 3.5 with 32 architecture, to see if that
 matters.

---
 appveyor.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index dc1189baef..5f2a5b746c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,6 +21,10 @@ environment:
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python35-conda32"
+      PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "32"
+
 install:
   # Install miniconda Python
   - "powershell ./tools/install_python.ps1"