Updated tests, tox and travis to support django 2.1 and python 3.7.

.travis.yml

@@ -1,37 +1,60 @@
 language: python
 python: 3.5
 env:
-  - TOX_ENV=py27-17
+  - TOX_ENV=py27-dj17
-  - TOX_ENV=py27-18
+  - TOX_ENV=py27-dj18
-  - TOX_ENV=py27-19
+  - TOX_ENV=py27-dj19
-  - TOX_ENV=py27-110
+  - TOX_ENV=py27-dj110
-  - TOX_ENV=py27-111
+  - TOX_ENV=py27-dj111
-  - TOX_ENV=py34-17
+  - TOX_ENV=py34-dj17
-  - TOX_ENV=py34-18
+  - TOX_ENV=py34-dj18
-  - TOX_ENV=py34-19
+  - TOX_ENV=py34-dj19
-  - TOX_ENV=py34-110
+  - TOX_ENV=py34-dj110
-  - TOX_ENV=py34-111
+  - TOX_ENV=py34-dj111
-  - TOX_ENV=py34-20
+  - TOX_ENV=py34-dj20
-  - TOX_ENV=py35-18
+  - TOX_ENV=py35-dj18
-  - TOX_ENV=py35-19
+  - TOX_ENV=py35-dj19
-  - TOX_ENV=py35-110
+  - TOX_ENV=py35-dj110
-  - TOX_ENV=py35-111
+  - TOX_ENV=py35-dj111
-  - TOX_ENV=py35-20
+  - TOX_ENV=py35-dj20
-  - TOX_ENV=py35-21
+  - TOX_ENV=py35-dj21
-  - TOX_ENV=py35-master
+  - TOX_ENV=py35-djmaster
+  # - TOX_ENV=py36-dj111
+  # - TOX_ENV=py36-dj20
+  # - TOX_ENV=py36-dj21
+  # - TOX_ENV=py36-djmaster
+  # - TOX_ENV=py37-dj20
+  # - TOX_ENV=py37-dj21
+  # - TOX_ENV=py37-djmaster
 matrix:
   include:
     - python: "3.6"
-      env: TOX_ENV=py36-111
+      env: TOX_ENV=py36-dj111
     - python: "3.6"
-      env: TOX_ENV=py36-20
+      env: TOX_ENV=py36-dj20
     - python: "3.6"
-      env: TOX_ENV=py36-21
+      env: TOX_ENV=py36-dj21
     - python: "3.6"
-      env: TOX_ENV=py36-master
+      env: TOX_ENV=py36-djmaster
+    - python: "3.7"
+      env: TOX_ENV=py37-dj20
+      dist: xenial
+      language: python
+      sudo: required
+    - python: "3.7"
+      env: TOX_ENV=py37-dj21
+      dist: xenial
+      language: python
+      sudo: required
+    - python: "3.7"
+      env: TOX_ENV=py37-djmaster
+      dist: xenial
+      language: python
+      sudo: required
   allow_failures:
-    - env: TOX_ENV=py35-master
+    - env: TOX_ENV=py35-djmaster
-    - env: TOX_ENV=py36-master
+    - env: TOX_ENV=py36-djmaster
+    - env: TOX_ENV=py37-djmaster
 install:
   - pip install tox
 script:

setup.py

@@ -46,6 +46,7 @@ setup(
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
@@ -56,6 +57,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Build Tools',
     ],
     license='MIT',

tests/settings.py

@@ -19,14 +19,24 @@ INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.messages',
     'django.contrib.sessions',
 ]
 
-MIDDLEWARE_CLASSES = [
+if django.VERSION < (2, 0):
-    'django.contrib.sessions.middleware.SessionMiddleware',
+    MIDDLEWARE_CLASSES = [
-    'django.middleware.common.CommonMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware'
-]
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ]
+else:
+    MIDDLEWARE = [
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ]
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -35,6 +45,7 @@ TEMPLATES = [{
     'OPTIONS': {
         'context_processors': [
             'django.contrib.auth.context_processors.auth',
+            'django.contrib.messages.context_processors.messages',
         ]
     },
 },]

tox.ini

@@ -1,20 +1,21 @@
 [tox]
 envlist =
-    py27-{17,18,19,110,111},
+    py27-{dj17,dj18,dj19,dj110,dj111},
-    py34-{17,18,19,110,111,20},
+    py34-{dj17,dj18,dj19,dj110,dj111,dj20},
-    py35-{18,19,110,111,20,21,master},
+    py35-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster},
-    py36-{18,19,110,111,20,21,master},
+    py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster},
+    py37-{dj20,dj21,djmaster},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    17: Django >= 1.7, < 1.8
+    dj17: Django >= 1.7, < 1.8
-    18: Django >= 1.8, < 1.9
+    dj18: Django >= 1.8, < 1.9
-    19: Django >= 1.9, < 1.10
+    dj19: Django >= 1.9, < 1.10
-    110: Django >= 1.10, < 1.11
+    dj110: Django >= 1.10, < 1.11
-    111: Django >= 1.11, < 1.12
+    dj111: Django >= 1.11, < 1.12
-    20: Django >= 2.0, < 2.1
+    dj20: Django >= 2.0, < 2.1
-    21: Django >= 2.1, < 2.2
+    dj21: Django >= 2.1, < 2.2
-    master: https://github.com/django/django/archive/master.tar.gz
+    djmaster: https://github.com/django/django/archive/master.tar.gz
     coverage
     codecov
 commands =