From a178ed751de41a20782ace72b0a0e0d8d2026249 Mon Sep 17 00:00:00 2001
From: Charlie Denton <charlie@meshy.co.uk>
Date: Thu, 2 Mar 2017 22:47:42 +0000
Subject: [PATCH] Test against Python 3.6 and Django 1.11b1

---
 .travis.yml | 23 +++++++++++++++++++++++
 tox.ini     |  8 +++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f1b076..c43f6db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   - DJANGO="Django>=1.4,<1.5"
   - DJANGO="Django>=1.5,<1.6"
@@ -16,10 +17,26 @@ env:
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
   - DJANGO="Django>=1.10,<1.11"
+  - DJANGO="Django==1.11b1"
   - DJANGO="https://github.com/django/django/tarball/master"
 
 matrix:
   exclude:
+  - python: "3.6"
+    env: DJANGO="Django>=1.4,<1.5"
+  - python: "3.6"
+    env: DJANGO="Django>=1.5,<1.6"
+  - python: "3.6"
+    env: DJANGO="Django>=1.6,<1.7"
+  - python: "3.6"
+    env: DJANGO="Django>=1.7,<1.8"
+  - python: "3.6"
+    env: DJANGO="Django>=1.8,<1.9"
+  - python: "3.6"
+    env: DJANGO="Django>=1.9,<1.10"
+  - python: "3.6"
+    env: DJANGO="Django>=1.10,<1.11"
+
   - python: "3.5"
     env: DJANGO="Django>=1.4,<1.5"
   - python: "3.5"
@@ -42,6 +59,8 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "3.3"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "3.3"
+    env: DJANGO="Django==1.11b1"
   - python: "3.3"
     env: DJANGO="https://github.com/django/django/tarball/master"
 
@@ -51,6 +70,8 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "3.2"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "3.2"
+    env: DJANGO="Django==1.11b1"
   - python: "3.2"
     env: DJANGO="https://github.com/django/django/tarball/master"
 
@@ -62,6 +83,8 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "2.6"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "2.6"
+    env: DJANGO="Django==1.11b1"
   - python: "2.6"
     env: DJANGO="https://github.com/django/django/tarball/master"
   allow_failures:
diff --git a/tox.ini b/tox.ini
index 6a3af4e..21b2874 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
 envlist=
     py26-django{14,15,16},
-    py27-django{14,15,16,17,18,19,110},
+    py27-django{14,15,16,17,18,19,110,111},
     py32-django{15,16,17,18},
     py33-django{15,16,17,18},
-    py34-django{15,16,17,18,19,110},
-    py35-django{18,19,110}
+    py34-django{15,16,17,18,19,110,111},
+    py35-django{18,19,110,111},
+    py36-django{111},
     # py33-django-dev,
     docs,
 
@@ -18,6 +19,7 @@ deps =
     django18: Django >= 1.8, < 1.9
     django19: Django >= 1.9, < 1.10
     django110: Django >= 1.10, < 1.11
+    django111: Django == 1.11b1
     django-dev: https://github.com/django/django/tarball/master
 commands=
     python runtests.py