Merge pull request #50 from jproffitt/master

Django 2.1 and Python 3.7 Support
worthwhile · Aug 16, 2018 · b0d7943 · b0d7943
2 parents a0da436 + 14eaef2
commit b0d7943
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,15 +5,16 @@ sudo: false
 cache: pip
 
 python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
+   - "2.7"
+   - "3.4"
+   - "3.5"
+   - "3.6"
 
 env:
   - DJANGO='https://github.com/django/django/archive/master.tar.gz'
-  - DJANGO='django>=2.0,<2.1.0'
-  - DJANGO='django>=1.11.0,<1.12.0'
+  - DJANGO='django>=2.1,<2.2'
+  - DJANGO='django>=2.0,<2.1'
+  - DJANGO='django>=1.11,<1.12'
 
 install:
   - travis_retry pip install --upgrade pip setuptools wheel
@@ -27,17 +28,37 @@ notifications:
   email: false
 
 matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: DJANGO='django>=2.1,<2.2'
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: DJANGO='django>=2.0,<2.1'
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
+
   exclude:
     - python: "2.7"
       env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
     - python: "2.7"
-      env: DJANGO='django>=2.0,<2.1.0'
+      env: DJANGO='django>=2.0,<2.1'
+    - python: "2.7"
+      env: DJANGO='django>=2.1,<2.2'
     - python: "3.4"
       env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
+    - python: "3.4"
+      env: DJANGO='django>=2.1,<2.2'
+    - python: "3.7"
+      env: DJANGO='django>=1.11,<1.12'
 
   allow_failures:
     - env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
   fast_finish: true
 
 after_success:
-    - coveralls
+    - coveralls
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,9 @@
 [tox]
 envlist =
        {py27,py34,py35,py36}-django111,
-       {py34,py35,py36}-django20,
-       {py35,py36}-django-latest
+       {py34,py35,py36,py37}-django20,
+       {py35,py36,py37}-django21,
+       {py35,py36,py37}-django-latest
 
 
 [testenv]
@@ -11,10 +12,12 @@ basepython =
              py34: python3.4
              py35: python3.5
              py36: python3.6
+             py37: python3.7
 
 
 commands = ./runtests.py
 deps =
-    django111: django>=1.11.0,<1.12.0
+    django111: django>=1.11.0,<2.0.0
     django20: django>=2.0,<2.1.0
-    django-latest: https://github.com/django/django/archive/master.tar.gz
+    django21: django>=2.1,<2.2.0
+    django-latest: https://github.com/django/django/archive/master.tar.gz