Add python 3.6 support for Django-master

ralphje · Dec 31, 2016 · 04e93d9 · 04e93d9
1 parent ccfe036
commit 04e93d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
       env: TOXENV=py27-1.8
     - python: 2.7
       env: TOXENV=py27-1.9
+    - python: 2.7
+      env: TOXENV=py27-1.10
     - python: 2.7
       env: TOXENV=py27-master
     - python: 3.3
@@ -31,14 +33,20 @@ matrix:
       env: TOXENV=py34-1.8
     - python: 3.4
       env: TOXENV=py34-1.9
+    - python: 3.4
+      env: TOXENV=py34-1.10
     - python: 3.4
       env: TOXENV=py34-master
     - python: 3.5
       env: TOXENV=py35-1.8
     - python: 3.5
       env: TOXENV=py35-1.9
+    - python: 3.5
+      env: TOXENV=py35-1.10
     - python: 3.5
       env: TOXENV=py35-master
+    - python: 3.6
+      env: TOXENV=py36-master
 after_success: codecov
 cache:
   directories:

diff --git a/tox.ini b/tox.ini
@@ -4,14 +4,16 @@ envlist =
     docs,
     {py27,py33,py34}-1.7,
     {py27,py33,py34,py35}-1.8
-    {py27,py34,py35}-{1.9,1.10,master}
+    {py27,py34,py35}-{1.9,1.10}
+    {py27,py34,py35,py36}-{master}
 
 [testenv]
 basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 usedevelop = true
 commands =
     invoke test {posargs}