From 16586f398ccd667707a327ecafd4564ab1fcb704 Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Fri, 5 Aug 2016 17:23:28 +0200
Subject: [PATCH] Update tox and travis settings for Django 1.10

---
 .travis.yml | 9 +++++++++
 tox.ini     | 7 ++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 620b0d2..63cad33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
+  - DJANGO="Django>=1.10,<1.11"
   - DJANGO="https://github.com/django/django/tarball/master"
 
 matrix:
@@ -32,16 +33,22 @@ matrix:
     env: DJANGO="Django>=1.4,<1.5"
   - python: "3.4"
     env: DJANGO="Django>=1.9,<1.10"
+  - python: "3.4"
+    env: DJANGO="Django>=1.10,<1.11"
 
   - python: "3.3"
     env: DJANGO="Django>=1.4,<1.5"
   - python: "3.3"
     env: DJANGO="Django>=1.9,<1.10"
+  - python: "3.3"
+    env: DJANGO="Django>=1.10,<1.11"
 
   - python: "3.2"
     env: DJANGO="Django>=1.4,<1.5"
   - python: "3.2"
     env: DJANGO="Django>=1.9,<1.10"
+  - python: "3.2"
+    env: DJANGO="Django>=1.10,<1.11"
 
   - python: "2.6"
     env: DJANGO="Django>=1.7,<1.8"
@@ -49,6 +56,8 @@ matrix:
     env: DJANGO="Django>=1.8,<1.9"
   - python: "2.6"
     env: DJANGO="Django>=1.9,<1.10"
+  - python: "2.6"
+    env: DJANGO="Django>=1.10,<1.11"
   - python: "2.6"
     env: DJANGO="https://github.com/django/django/tarball/master"
   allow_failures:
diff --git a/tox.ini b/tox.ini
index 2a62813..6a3af4e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
 envlist=
     py26-django{14,15,16},
-    py27-django{14,15,16,17,18,19},
+    py27-django{14,15,16,17,18,19,110},
     py32-django{15,16,17,18},
     py33-django{15,16,17,18},
-    py34-django{15,16,17,18,19},
-    py35-django{18,19}
+    py34-django{15,16,17,18,19,110},
+    py35-django{18,19,110}
     # py33-django-dev,
     docs,
 
@@ -17,6 +17,7 @@ deps =
     django17: Django >= 1.7, < 1.8
     django18: Django >= 1.8, < 1.9
     django19: Django >= 1.9, < 1.10
+    django110: Django >= 1.10, < 1.11
     django-dev: https://github.com/django/django/tarball/master
 commands=
     python runtests.py