From 3eef317761c100d882dddd32beef4e0a3ff2e1b4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Tue, 16 May 2017 13:44:53 +0100
Subject: [PATCH 1/2] Add python 3.6 to Tox file

A bit more is needed to add it to travis
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 7053ac8..23caef6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
 envlist =
-    {py27,py35,pypy}-django-{18,19,110,111}
+    {py27,py35,py36,pypy}-django-{18,19,110,111}
     {py35}-django-master
 
 [testenv]
 basepython =
     py27: python2.7
     py35: python3.5
+    py36: python3.6
     pypy: pypy
 deps =
     redis

From 737fa37ae4da7f9f16a383561d0d6db0b898aa4c Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Tue, 16 May 2017 14:36:03 +0100
Subject: [PATCH 2/2] Run Django 1.11 tests with Python 3.6

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c1dd71b..b86103f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,9 @@ env:
   - TOXENV=pypy-django-110
   - TOXENV=pypy-django-111
 matrix:
+  include:
+    - python: 3.6
+      env: TOXENV=py36-django-111
   allow_failures:
     - env: TOXENV=py35-django-master
 script: