Explicitly support Python 3.6

3 files changed, 10 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 54fd58c..00730e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,15 @@
 sudo: false
 language: python
 python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
   - "3.5"
+  - "3.6"
+  - "pypy"
 install:
   - "pip install 'virtualenv<14.0.0' tox"
   - "make README"
-script: tox
+script: tox -e py
diff --git a/setup.py b/setup.py
index 7d91953..c99670f 100644
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )
 
diff --git a/tox.ini b/tox.ini
index 9e1a725..38565c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py32,py33,py34,py35,pypy
+envlist = py26,py27,py32,py33,py34,py35,py36,pypy
 [testenv]
 changedir = {envtmpdir}
 deps=-r{toxinidir}/test-requirements.txt