Merge pull request #42 from astrofrog/update-ci-versions

CI: make sure we test against Matplotlib 2.0 and Python 3.6

Author: astrofrog

.travis.yml

@@ -19,8 +19,9 @@ env:
     - PYTHON_VERSION=3.4 MATPLOTLIB_VERSION=1.4 NUMPY_VERSION=1.9
     - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=1.5
     - PYTHON_VERSION=3.5 MATPLOTLIB_VERSION=1.5
-    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=2.0 CONDA_CHANNELS="conda-forge/label/rc conda-forge"
-    - PYTHON_VERSION=3.5 MATPLOTLIB_VERSION=2.0 CONDA_CHANNELS="conda-forge/label/rc conda-forge"
+    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=2.0
+    - PYTHON_VERSION=3.5 MATPLOTLIB_VERSION=2.0
+    - PYTHON_VERSION=3.6 MATPLOTLIB_VERSION=2.0
 
     # The following build is meant to check that dependencies get set up correctly, but currently
     # the image tests fail, which should be investigated. 

appveyor.yml

@@ -14,10 +14,22 @@ environment:
 
   matrix:
       - PYTHON_VERSION: "2.6"
+        MATPLOTLIB_VERSION: "1.4"
+
       - PYTHON_VERSION: "2.7"
+        MATPLOTLIB_VERSION: "1.5"
+
       - PYTHON_VERSION: "3.3"
+        MATPLOTLIB_VERSION: "1.5"
+
       - PYTHON_VERSION: "3.4"
+        MATPLOTLIB_VERSION: "1.5"
+
       - PYTHON_VERSION: "3.5"
+        MATPLOTLIB_VERSION: "1.5"
+
+      - PYTHON_VERSION: "3.6"
+        MATPLOTLIB_VERSION: "2.0"
 
 platform:
     -x64