Merge e35538f into 4aec0f2

.travis.yml

@@ -1,26 +1,30 @@
 language: python
+sudo: false
 python:
   - "2.7"
-sudo: false
-env:
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
-  - TOX_ENV=pypy
+  - "3.5"
+  - "pypy"
+  - "pypy3"
+
 install:
   - pip install coveralls tox
+
 script:
   - tox -e $TOX_ENV
   - python setup.py check -r
+
 after_success:
   - coveralls --verbose
 
 matrix:
-  allow_failures:
-    - env: TOX_ENV=py27
-    - env: TOX_ENV=py33
-    - env: TOX_ENV=py34
-    - env: TOX_ENV=pypy
   include:
+    - python: 2.7
+      env: TOX_ENV=py27
     - python: 3.5
       env: TOX_ENV=py35
+    - python: 3.5
+      env: TOX_ENV=py36
+    - python: pypy
+      env: TOX_ENV=pypy
+    - python: pypy3
+      env: TOX_ENV=pypy3

tox.ini

@@ -46,11 +46,21 @@ deps =
      {[py]deps}
 basepython = python3.5
 
+[testenv:py36]
+deps =
+     {[py]deps}
+basepython = python3.6
+
 [testenv:pypy]
 deps =
      {[py]deps}
 basepython = pypy
 
+[testenv:pypy3]
+deps =
+     {[py]deps}
+basepython = pypy3
+
 [testenv:pycodestyle]
 deps=
     {[py]deps}