Add python 3.5 and 3.6 to CI (untitaker#24)

Hugo Osvaldo Barrera · untitaker · commit a8c9d861cab3 · 2017-03-26T00:03:24.000+01:00
* Also test on recent python versions

* Tidy up and simplify travis' build matrix

* Test python 3.5 and 3.6 on windows as well
diff --git a/.travis.yml b/.travis.yml
@@ -2,34 +2,39 @@ sudo: false
 os: linux
 language: python
 
+python:
+    - 2.6
+    - 2.7
+    - pypy
+    - 3.3
+    - 3.4
+    - 3.5
+    - 3.6
+    - pypy3.3-5.2-alpha1
+
+env:
+    - TOXENV=test
+
 matrix:
     include:
-        - os: osx
+        - # The OS X VM doesn't have any Python support at all
+          # See https://github.com/travis-ci/travis-ci/issues/2312
+          os: osx
           language: generic
-          env: TOXENV_SUFFIX=test
+          env: TOXENV=test
+          before_install:
+            - brew update
+            - brew install python3
+            - virtualenv $HOME/osx-py3 -p python3
+            - source $HOME/osx-py3/bin/activate
+        - python: 2.7
+          env: TOXENV=stylecheck
+        - python: 3.6
+          env: TOXENV=stylecheck
 
-python:
-    - "2.6"
-    - "2.7"
-    - "pypy"
-    - "3.3"
-    - "3.4"
 
 install:
-    - # The OS X VM doesn't have any Python support at all
-      # See https://github.com/travis-ci/travis-ci/issues/2312
-      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-          brew update;
-          brew install python3;
-          virtualenv -p python3 $HOME/osx-py3;
-          . $HOME/osx-py3/bin/activate;
-          export TRAVIS_PYTHON_VERSION="$(python --version | cut -d ' ' -f 2 | cut -d . -f -2)";
-      fi
     - pip install tox
 
 script:
-    - export TOX_PY="$(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')"
-    - tox -e $TOX_PY-test
-    - if [ "$TRAVIS_PYTHON_VERSION" = "2.7" ] || [ "$TRAVIS_PYTHON_VERSION" = ".3.5" ]; then
-          tox -e $TOX_PY-stylecheck;
-      fi
+    - tox
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,6 +4,8 @@ environment:
     - PYTHON: "C:/Python27"
     - PYTHON: "C:/Python33"
     - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python35"
+    - PYTHON: "C:/Python36"
 
 init:
   - "ECHO %PYTHON%"
