Update build config

pinax · Apr 16, 2017 · 1ea7b07 · 1ea7b07
1 parent f38386f
commit 1ea7b07
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,16 +5,33 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   - DJANGO=1.8
   - DJANGO=1.9
+  - DJANGO=1.10
+  - DJANGO=1.11
   - DJANGO=master
 matrix:
   exclude:
     - python: "3.3"
       env: DJANGO=1.9
+    - python: "3.3"
+      env: DJANGO=1.10
+    - python: "3.3"
+      env: DJANGO=1.11
+    - python: "2.7"
+      env: DJANGO=master
     - python: "3.3"
       env: DJANGO=master
+    - python: "3.4"
+      env: DJANGO=master
+    - python: "3.6"
+      env: DJANGO=1.8
+    - python: "3.6"
+      env: DJANGO=1.9
+    - python: "3.6"
+      env: DJANGO=1.10
 install:
   - pip install tox coveralls
 script:

diff --git a/tox.ini b/tox.ini
@@ -6,17 +6,20 @@ exclude = migrations/*,docs/*
 
 [tox]
 envlist =
-    py27-{1.8,1.9,master},
+    py27-{1.8,1.9,1.10,1.11},
     py33-{1.8},
-    py34-{1.8,1.9,master},
-    py35-{1.8,1.9,master}
+    py34-{1.8,1.9,1.10,1.11},
+    py35-{1.8,1.9,1.10,1.11,master}
+    py36-{1.11,master}
 
 [testenv]
 deps =
     coverage == 4.0.2
     flake8 == 2.5.0
     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.11,<1.12
     master: https://github.com/django/django/tarball/master
 usedevelop = True
 setenv =