Test against Django 1.10

Suor · Aug 9, 2016 · a8a02fb · a8a02fb
1 parent 82540ac
commit a8a02fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,19 +11,23 @@ env:
   - TOXENV=py27-dj17
   - TOXENV=py27-dj18
   - TOXENV=py27-dj19
+  - TOXENV=py27-dj110
   - TOXENV=py27-djmaster
   - TOXENV=py33-dj17
   - TOXENV=py33-dj18
   - TOXENV=py34-dj17
   - TOXENV=py34-dj18
   - TOXENV=py34-dj19
+  - TOXENV=py34-dj110
   - TOXENV=py34-djmaster
   - TOXENV=py35-dj18
   - TOXENV=py35-dj19
+  - TOXENV=py35-dj110
   - TOXENV=py35-djmaster
   - TOXENV=pypy-dj17
   - TOXENV=pypy-dj18
   - TOXENV=pypy-dj19
+  - TOXENV=pypy-dj110
 matrix:
   allow_failures:
     - env: "TOXENV=py27-djmaster"

diff --git a/tox.ini b/tox.ini
@@ -2,18 +2,19 @@
 minversion = 2.1
 envlist =
     lint,
-    py27-dj{17,18,19,master},
+    py27-dj{17,18,19,110,master},
     py33-dj{17,18},
-    py34-dj{17,18,19,master},
-    py35-dj{18,19,master},
-    pypy-dj{17,18,19}
+    py34-dj{17,18,19,110,master},
+    py35-dj{18,19,110,master},
+    pypy-dj{17,18,19,110}
 
 [testenv]
 whitelist_externals = env
 deps =
     dj17: Django>=1.7,<1.8
     dj18: Django>=1.8,<1.9
     dj19: Django>=1.9,<1.10
+    dj110: Django>=1.10,<1.11
     djmaster: git+https://github.com/django/django
     mysqlclient
     py{27,33,34,35}: psycopg2