Add django 2.0 to tox and travis

ralphje · Dec 17, 2017 · 0f6fbf3 · 0f6fbf3
1 parent d7ecb55
commit 0f6fbf3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,8 @@ matrix:
       env: TOXENV=py34-1.10
     - python: 3.4
       env: TOXENV=py34-1.11
+    - python: 3.4
+      env: TOXENV=py34-2.0
     - python: 3.5
       env: TOXENV=py35-1.8
     - python: 3.5
@@ -39,10 +41,14 @@ matrix:
       env: TOXENV=py35-1.10
     - python: 3.5
       env: TOXENV=py35-1.11
+    - python: 3.5
+      env: TOXENV=py35-2.0
     - python: 3.5
       env: TOXENV=py35-master
     - python: 3.6
       env: TOXENV=py36-1.11
+    - python: 3.6
+      env: TOXENV=py36-2.0
     - python: 3.6
       env: TOXENV=py36-master
 after_success: codecov

diff --git a/tox.ini b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     {py27,py33,py34,py35}-1.8
     {py27,py34,py35}-{1.9,1.10}
     {py27,py34,py35,py36}-1.11
+    {py34,py35,py36}-2.0
     {py35,py36}-master
 
 [testenv]
@@ -21,7 +22,8 @@ deps =
     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
+    1.11: Django>=1.11,<2.0
+    2.0: Django>=2.0,<2.1
     master: https://github.com/django/django/archive/master.tar.gz
     -r{toxinidir}/tests/requirements.txt