Merge pull request #1073 from ThomasWaldmann/test-py36

test on py36
2016-05-22 13:38:47 +02:00 · 2016-05-22 13:38:47 +02:00 · 5675e4fceb
parent a1365c9bc7 d27a3521ec
commit 5675e4fceb
2 changed files with 6 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,6 +14,9 @@ matrix:
        - python: 3.5
          os: linux
          env: TOXENV=py35
+        - python: nightly
+          os: linux
+          env: TOXENV=py36
        - python: 3.5
          os: linux
          env: TOXENV=flake8
@ -25,6 +28,8 @@ matrix:
          os: osx
          osx_image: xcode6.4
          env: TOXENV=py35
+    allow_failures:
+        - python: nightly

 install:
    - ./.travis/install.sh
--- a/tox.ini
+++ b/tox.ini
@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate

 [tox]
-envlist = py{34,35},flake8
+envlist = py{34,35,36},flake8

 [testenv]
 # Change dir to avoid import problem for cython code. The directory does