Merge pull request #183 from bradjasper/test-matrix-django-1.11

Add Django 1.11 to testing matrix
rpkilby · Mar 8, 2017 · 19cdf7a · 19cdf7a
2 parents ec98386 + 5bdb1d1
commit 19cdf7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ env:
   - DJANGO=1.8
   - DJANGO=1.9
   - DJANGO=1.10
+  - DJANGO=1.11
   - DJANGO=master
 matrix:
   exclude:
@@ -19,6 +20,8 @@ matrix:
       env: DJANGO=1.9
     - python: "3.3"
       env: DJANGO=1.10
+    - python: "3.3"
+      env: DJANGO=1.11
     - python: "3.3"
       env: DJANGO=master
     - python: "3.4"

diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    py27-{1.8,1.9,1.10},
+    py27-{1.8,1.9,1.10,1.11},
     py33-{1.8},
-    py34-{1.8,1.9,1.10},
-    py35-{1.8,1.9,1.10,master},
-    py36-{master}
+    py34-{1.8,1.9,1.10,1.11},
+    py35-{1.8,1.9,1.10,1.11,master},
+    py36-{1.11,master}
 skipsdist = {env:TOXBUILD:false}
 
 [testenv]
@@ -14,6 +14,7 @@ deps =
     1.8: Django>=1.8,<1.9
     1.9: Django>=1.9,<1.10
     1.10: Django>=1.10,<1.11
+    1.11: Django>=1.11b1,<2.0
     master: https://github.com/django/django/tarball/master
 setenv =
     LANG=en_US.UTF-8