From 2c442b10d48ccc348d2b44e64ab0a2a429167fc8 Mon Sep 17 00:00:00 2001
From: Simon Hanna <simon.h4nn4@gmail.com>
Date: Tue, 18 Oct 2016 22:56:11 +0200
Subject: [PATCH 1/2] Simplify tox config

Also add django 1.10
---
 tox.ini | 90 ++++-----------------------------------------------------
 1 file changed, 6 insertions(+), 84 deletions(-)

diff --git a/tox.ini b/tox.ini
index d4d8ab1..75d521f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,90 +1,12 @@
 [tox]
-envlist =
-    py27dj1.6, py27dj1.7, py27dj1.8, py27dj1.9
-    py33dj1.6, py33dj1.7, py33dj1.8
-    py34dj1.6, py34dj1.7, py34dj1.8, py34dj1.9
-                          py35dj1.8, py35dj1.9
-
+envlist = py{27,33,34}-dj1.{6,7,8}, py{27,34}-dj1.9, py35-dj1.{8,9,10}
 
 [testenv]
 deps =
     coverage == 3.6
+    dj1.6: Django>=1.6,<1.7
+    dj1.7: Django>=1.7,<1.8
+    dj1.8: Django>=1.8,<1.9
+    dj1.9: Django>=1.9,<1.10
+    dj1.10: Django>=1.10,<1.11
 commands = coverage run setup.py test
-
-[testenv:py27dj1.6]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django == 1.6.11
-
-[testenv:py27dj1.7]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django == 1.7.11
-
-[testenv:py27dj1.8]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django == 1.8.7
-
-[testenv:py27dj1.9]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django == 1.9.0
-
-[testenv:py33dj1.6]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django == 1.6.11
-
-[testenv:py33dj1.7]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django == 1.7.11
-
-[testenv:py33dj1.8]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django == 1.8.7
-
-[testenv:py34dj1.6]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django == 1.6.11
-
-[testenv:py34dj1.7]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django == 1.7.11
-
-[testenv:py34dj1.8]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django == 1.8.7
-
-[testenv:py34dj1.9]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django == 1.9.0
-
-[testenv:py35dj1.8]
-basepython = python3.5
-deps =
-    {[testenv]deps}
-    Django == 1.8.7
-
-[testenv:py35dj1.9]
-basepython = python3.5
-deps =
-    {[testenv]deps}
-    Django == 1.9.0
\ No newline at end of file

From 0a66afcaf7f61aba5f6cea7e6fb3cb935bac99d0 Mon Sep 17 00:00:00 2001
From: Simon Hanna <simon.h4nn4@gmail.com>
Date: Tue, 18 Oct 2016 22:56:47 +0200
Subject: [PATCH 2/2] Update travis config

* Include django 1.10.2
* Update to django 1.9.10
* Update to django 1.8.15
---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 43b2af7..35ffb9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,9 @@ python:
 
 env:
   matrix:
-    - DJANGO=Django==1.9.0
-    - DJANGO=Django==1.8.7
+    - DJANGO=Django==1.10.2
+    - DJANGO=Django==1.9.10
+    - DJANGO=Django==1.8.15
     - DJANGO=Django==1.7.11
     - DJANGO=Django==1.6.11
 
@@ -24,7 +25,9 @@ matrix:
     - python: "3.5"
       env: DJANGO=Django==1.6.11
     - python: "3.3"
-      env: DJANGO=Django==1.9.0
+      env: DJANGO=Django==1.10.2
+    - python: "3.3"
+      env: DJANGO=Django==1.9.10
 
 script:
   - flake8 --max-line-length=100 --max-complexity=10 --statistics --benchmark django_slowtests