Test against Django 1.11 and 2.0

.travis.yml

@@ -4,17 +4,23 @@ python:
  - 2.7
  - 3.4
  - 3.5
+ - 3.6
 
 env:
  - DJANGO=1.8
- - DJANGO=1.9
  - DJANGO=1.10
+ - DJANGO=1.11
  - DJANGO=master
 
 matrix:
-  include:
-    - python: 3.6
+  exclude:
+    - python: 2.7
       env: DJANGO=master
+    - python: 3.6
+      env: DJANGO=1.8
+    - python: 3.6
+      env: DJANGO=1.10
+  include:
     - python: 3.5
       env: TOXENV=flake8
   allow_failures:

tox.ini

@@ -2,33 +2,30 @@
 ; Minimum version of Tox
 minversion = 1.8
 envlist =
-    py{27,34,35}-{dj18,dj19,dj110},
-    py{27,34,35,36}-{djmaster},
+    py{27,34,35}-{dj18,dj110,dj111},
+    py{27,34,35,36}-{dj111},
+    py{35,36}-{djmaster},
     flake8
 
 [travis]
-python =
-    2.7: py27
-    3.4: py34
-    3.5: py35
-    3.6: py36
 unignore_outcomes = True
 
 [travis:env]
 DJANGO =
     1.8: dj18
     1.9: dj19
     1.10: dj110
+    1.11: dj111
     master: djmaster
 
 [testenv]
 commands = make coverage
 deps =
     coverage
     py27: mock
-    dj18: Django>=1.8,<1.9
-    dj19: Django>=1.9,<1.10
-    dj110: Django>=1.10,<1.11
+    dj18: Django<1.9
+    dj110: Django<1.11
+    dj111: Django<1.12
     djmaster: https://github.com/django/django/archive/master.tar.gz
 ignore_outcome =
     djmaster: True