Merge de0ac6b into dccde7d

rm-hull · Jan 21, 2017 · b062704 · b062704
2 parents dccde7d + de0ac6b
commit b062704
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,14 @@ matrix:
           env: TOXENV=py34
         - python: 3.5
           env: TOXENV=py35
-        - python: 3.6-dev
+        - python: 3.6
           env: TOXENV=py36
+        - python: 3.7-dev
+          env: TOXENV=py37
         - python: 2.7
           env: TOXENV=qa
     allow_failures:
-        - python: 3.6-dev
+        - python: 3.7-dev
 addons:
   apt:
     packages:

diff --git a/setup.py b/setup.py
@@ -36,6 +36,7 @@
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5"
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6"
     ]
 )
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 # See LICENSE.rst for details.
 
 [tox]
-envlist = py{27,34,35,36},qa
+envlist = py{27,34,35,36,37},qa
 skip_missing_interpreters = True
 
 [testenv]