Added Python 3.7 and Django 2.1.

AndrewIngram · Oct 21, 2018 · 48819d8 · 48819d8
1 parent aa58167
commit 48819d8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,17 +6,44 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+# Travis does not currently support Python 3.7 globally, see below.
+#  - "3.7"
 
 env:
   - DJANGO=django111
   - DJANGO=django20
+  - DJANGO=django21
   - DJANGO=djangomaster
 
 matrix:
+  # Workaround to include Python 3.7
+  include:
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+      env: DJANGO=django111
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+      env: DJANGO=django20
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+      env: DJANGO=django21
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+      env: DJANGO=djangomaster
   exclude:
     - python: "2.7"
       env: DJANGO=django20
     - python: "2.7"
+      env: DJANGO=django21
+    - python: "2.7"
+      env: DJANGO=djangomaster
+    - python: "3.4"
+      env: DJANGO=django21
+    - python: "3.4"
       env: DJANGO=djangomaster
   allow_failures:
     - env: DJANGO=djangomaster

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist = py{27}-django{111}
-          py{34,35,36}-django{111,20}
-          py{35,36}-djangomaster
+          py{34}-django{111,20}
+          py{35,36,37}-django{111,20,21,master}
           docs
 
 [testenv]
@@ -15,6 +15,7 @@ deps =
     django-nose
     django111: Django>=1.11,<1.12
     django20: Django>=2.0<2.1
+    django21: Django>=2.1<2.2
     djangomaster: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:docs]