Added Django 1.11 to test matrix

django-wiki · Apr 29, 2017 · e409510 · e409510
1 parent f74b682
commit e409510
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,12 +27,15 @@ env:
 - TOXENV=py27-django18
 - TOXENV=py27-django19
 - TOXENV=py27-django110
+- TOXENV=py27-django111
 - TOXENV=py34-django18
 - TOXENV=py34-django19
 - TOXENV=py34-django110
+- TOXENV=py34-django111
 - TOXENV=py35-django18
 - TOXENV=py35-django19
 - TOXENV=py35-django110
+- TOXENV=py35-django111
 
 install:
   - pip install tox>=2.1 coveralls

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@ def read_file(fname):
 
 
 requirements = [
-    "Django>=1.8,<1.11",
+    "Django>=1.8,<1.12",
     "bleach>=1.5,<2",
     "Pillow",
     "django-nyt>=1.0b1",

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-# Ensure you add to .travis.yml if you add here
+# Ensure you add to .travis.yml if you add here, using `tox -l`
-envlist = {py27,py34,py35}-django{18,19,110}
+envlist = {py27,py34,py35}-django{18,19,110,111}
 
 [testenv]
 
@@ -27,6 +27,7 @@ deps =
      django18: Django==1.8.2
      django19: Django==1.9
      django110: Django==1.10.2
+     django111: Django==1.11
      django-mptt==0.8.6
      django-sekizai==0.10.0
      sorl-thumbnail==12.3