Merge pull request #67 from hzdg/one-ten

Test on Django 1.10 too
hzdg · Aug 22, 2016 · 3452624 · 3452624
2 parents ad0b741 + bec6b3a
commit 3452624
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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},

diff --git 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