From e50f47af3d7c6ac624be3f6a8575651b8cebe01c Mon Sep 17 00:00:00 2001
From: Vlad Niculae <vlad@vene.ro>
Date: Sat, 10 Jun 2017 09:05:06 +0200
Subject: [PATCH 1/3] bump ci python version

---
 .travis.yml  |  2 +-
 appveyor.yml | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4b1f32e..0d3e2e7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ sudo: false
 language: python
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
+  - "3.6"
 install:
   # We do this conditionally because it saves us some downloading if the
   # version is the same.
diff --git a/appveyor.yml b/appveyor.yml
index c25edfb7..347b7c46 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,26 +9,21 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\build_tools\\appveyor\\run_with_env.cmd"
 
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.8"
+    - PYTHON_VERSION: "2.7.13"
       PYTHON_ARCH: "32"
       MINICONDA: "C:\\Miniconda"
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.8"
+    - PYTHON_VERSION: "2.7.13"
       PYTHON_ARCH: "64"
       MINICONDA: "C:\\Miniconda-x64"
 
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.0"
+    - PYTHON_VERSION: "3.6.0"
       PYTHON_ARCH: "32"
-      MINICONDA: "C:\\Miniconda35"
+      MINICONDA: "C:\\Miniconda36"
 
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.0"
+    - PYTHON_VERSION: "3.6.0"
       PYTHON_ARCH: "64"
-      MINICONDA: "C:\\Miniconda35-x64"
-
+      MINICONDA: "C:\\Miniconda36-x64"
 
 
 install:

From 652a84c53991ace4baa6f0b2cef4ea4145f732ab Mon Sep 17 00:00:00 2001
From: Vlad Niculae <vlad@vene.ro>
Date: Sat, 10 Jun 2017 09:57:23 +0200
Subject: [PATCH 2/3] try up-to-date conda-build

---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 347b7c46..fc506afd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,9 +43,7 @@ install:
   # Update previous packages and install the build and runtime dependencies of the project.
   - conda update --all --yes
   - conda install --quiet --yes numpy scipy cython nose scikit-learn wheel"
-  # there seems to be a problem with conda-build 1.21.0 on python27 and win64, avoid this
-  # by using a previous version
-  - conda install --quiet --yes conda-build=1.21.0
+  - conda install --quiet --yes conda-build
   - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst"
 
   - ps: "ls dist"

From 22b96dd0d5989a54eb15033616ac1e93be9f8ebe Mon Sep 17 00:00:00 2001
From: Vlad Niculae <vlad@vene.ro>
Date: Sat, 10 Jun 2017 09:59:54 +0200
Subject: [PATCH 3/3] actually, do we even need conda-build?

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index fc506afd..95209eb9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,7 +43,6 @@ install:
   # Update previous packages and install the build and runtime dependencies of the project.
   - conda update --all --yes
   - conda install --quiet --yes numpy scipy cython nose scikit-learn wheel"
-  - conda install --quiet --yes conda-build
   - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst"
 
   - ps: "ls dist"