Added Python 3.6 testing

@@ -20,8 +20,13 @@ matrix:
       env: TOXENV=py35-django-111
     - python: 3.5
       env: TOXENV=py35-django-master
+    - python: 3.6
+      env: TOXENV=py36-django-111
+    - python: 3.6
+      env: TOXENV=py36-django-master
   allow_failures:
     - env: TOXENV=py35-django-master
+    - env: TOXENV=py36-django-master
 install:
 - pip install tox
 script:

@@ -3,6 +3,11 @@
 History
 =======
 
+X.Y.Z (YYYY-MM-DD)
+------------------
+
+* Added testing for Python 3.6.
+
 1.8.0 (2017-02-03)
 ------------------
 

@@ -36,6 +36,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,

 [tox]
 envlist =
     py{27,34,35}-django1{8,9,10,11}
-    py{35}-master
+    py36-django111
+    py{35,36}-master
 
 [testenv]
 basepython =
     py27: python2.7
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 commands = {envpython} setup.py test
 setenv=
   PYTHONWARNINGS=default