From b40e0fbedb0f2f99b9b229973da2c003b151bfaa Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 22 Aug 2016 20:38:40 +0300
Subject: [PATCH 1/2] Test on Django 1.10 too

Fixes #66
---
 tox.ini | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index 4296a12..dc36d9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
-    python35-django19, python35-django18
-    python34-django19, python34-django18, python34-django17
+    python35-django110, python35-django19, python35-django18
+    python34-django110, python34-django19, python34-django18, python34-django17
     python33-django18, python33-django17, python33-django16
-    python27-django19, python27-django18, python27-django17, python27-django16, python27-django15, python27-django14,
+    python27-django110, python27-django19, python27-django18, python27-django17, python27-django16, python27-django15, python27-django14,
     python26-django16, python26-django15, python26-django14
 
 [tox:travis]
@@ -28,5 +28,5 @@ deps =
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
-    # can't use <1.10 since 1.10a1 is out and that would match :(
-    django19: Django>=1.9,<=1.9.7
+    django19: Django>=1.9,<=1.10
+    django110: Django>=1.10,<=1.11

From bec6b3a85758a828338019a1ee429c7765fba7d6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 22 Aug 2016 21:10:22 +0300
Subject: [PATCH 2/2] Don't use pytest-django 3 just yet

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a280c27..3000500 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ def run_tests(self):
     ],
     install_requires=install_requires,
     tests_require=[
-        'pytest-django',
+        'pytest-django<3.0',
         'Django',
     ],
     cmdclass={'test': PyTest},