Add suport for Python 3.6 and Django 1.11

APSL · Sep 14, 2017 · 38b8840 · 38b8840
1 parent 0caf247
commit 38b8840
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
      python: 3.4
    - env: TOXENV=py35-dj18
      python: 3.5
+   - env: TOXENV=py36-dj18
+     python: 3.6
    - env: TOXENV=py27-dj19
      python: 2.7
    - env: TOXENV=pypy-dj19
@@ -21,14 +23,28 @@ matrix:
      python: 3.4
    - env: TOXENV=py35-dj19
      python: 3.5
+   - env: TOXENV=py36-dj19
+     python: 3.6     
    - env: TOXENV=py27-dj110
      python: 2.7
    - env: TOXENV=pypy-dj110
      python: pypy
    - env: TOXENV=py34-dj110
      python: 3.4
    - env: TOXENV=py35-dj110
-     python: 3.5    
+     python: 3.5
+   - env: TOXENV=py36-dj110
+     python: 3.6     
+   - env: TOXENV=py27-dj111
+     python: 2.7
+   - env: TOXENV=pypy-dj111
+     python: pypy
+   - env: TOXENV=py34-dj111
+     python: 3.4
+   - env: TOXENV=py35-dj111
+     python: 3.5
+   - env: TOXENV=py36-dj111
+     python: 3.6    
    - env: TOXENV=flake8
      python: 3.4
 before_install:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,py}-dj{18,19,110}, flake8
+envlist = py{27,34,35,36,py}-dj{18,19,110,111}, flake8
 
 [flake8]
 max-line-length = 120
@@ -12,6 +12,7 @@ basepython =
     py27: python2.7
     py34: python3.4
     py35: python3.5
+    py36: python3.6
     pypy: pypy
 
 deps =
@@ -31,6 +32,7 @@ deps =
     dj18: Django>=1.8,<1.9
     dj19: Django>=1.9,<1.10
     dj110: Django>=1.10,<1.11
+    dj111: Django>=1.11,<2.0
 
 [testenv:flake8]
 basepython = python3.4