From ad224911e33e70d11df160a4d4789036d3ce9461 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 5 Oct 2017 15:10:24 -0400
Subject: [PATCH] Added Python 3.6 testing

---
 .travis.yml | 5 +++++
 HISTORY.rst | 5 +++++
 setup.py    | 1 +
 tox.ini     | 4 +++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9f5a340..120eded 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/HISTORY.rst b/HISTORY.rst
index 5cb9d26..e9c654a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 =======
 
+X.Y.Z (YYYY-MM-DD)
+------------------
+
+* Added testing for Python 3.6.
+
 1.8.0 (2017-02-03)
 ------------------
 
diff --git a/setup.py b/setup.py
index 2f9939c..233db57 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@
         '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,
diff --git a/tox.ini b/tox.ini
index e3b13ca..6f8fccf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,15 @@
 [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