Merge pull request #62 from founders4schools/upgrade/django-2.0

Add Django 2.0 to the build matrix
arteria · Sep 27, 2017 · e8cef0f · e8cef0f
2 parents cbc99fe + cb36891
commit e8cef0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,8 @@ matrix:
   - python: "3.5"
     env:
       - TOX_ENV=py35-django111
+  - python: "3.5"
+    env: TOX_ENV=py35-django20
   - python: "3.6"
     env:
       - TOX_ENV=py36-django18
@@ -36,6 +38,14 @@ matrix:
   - python: "3.6"
     env:
       - TOX_ENV=py36-django111
+  - python: "3.6"
+    env: TOX_ENV=py36-django20
+
+  allow_failures:
+    - python: "3.5"
+      env: TOX_ENV=py35-django20
+    - python: "3.6"
+      env: TOX_ENV=py36-django20
 
 install:
     - pip install tox-travis

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,14 @@
 [tox]
 envlist =
-    py{27,35,36}-django{18,19,110,111},
+    py{27,35,36}-django{18,19,110,111,20},
 
 [testenv]
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.1,<1.10
     django110: Django>=1.10,<1.11
-    django111: Django>=1.11,<1.12
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0a1,<2.1
     -r{toxinidir}/requirements-test.txt
     -r{toxinidir}/requirements.txt
 commands =