Merge pull request #75 from mvbrn/master

add Python 3.7 and Django 2.2/3.0 to the test matrix

Author: agusmakmun

.travis.yml

@@ -4,52 +4,67 @@ sudo: false
 matrix:
   include:
     - python: 2.7
-      env: DJANGO=1.8.*
+      env: DJANGO="==1.8.*"
     - python: 2.7
-      env: DJANGO=1.9.*
+      env: DJANGO="==1.9.*"
     - python: 2.7
-      env: DJANGO=1.10.*
+      env: DJANGO="==1.10.*"
     - python: 2.7
-      env: DJANGO=1.11.*
+      env: DJANGO="==1.11.*"
 
     - python: 3.4
-      env: DJANGO=1.8.*
+      env: DJANGO="==1.8.*"
     - python: 3.4
-      env: DJANGO=1.9.*
+      env: DJANGO="==1.9.*"
     - python: 3.4
-      env: DJANGO=1.10.*
+      env: DJANGO="==1.10.*"
     - python: 3.4
-      env: DJANGO=1.11.*
+      env: DJANGO="==1.11.*"
 
     - python: 3.5
-      env: DJANGO=1.8.*
+      env: DJANGO="==1.8.*"
     - python: 3.5
-      env: DJANGO=1.9.*
+      env: DJANGO="==1.9.*"
     - python: 3.5
-      env: DJANGO=1.10.*
+      env: DJANGO="==1.10.*"
     - python: 3.5
-      env: DJANGO=1.11.*
+      env: DJANGO="==1.11.*"
     - python: 3.5
-      env: DJANGO=2.0.*
+      env: DJANGO="==2.0.*"
     - python: 3.5
-      env: DJANGO=2.1.*
+      env: DJANGO="==2.1.*"
+    - python: 3.5
+      env: DJANGO="==2.2.*"
 
     - python: 3.6
-      env: DJANGO=1.8.*
+      env: DJANGO="==1.8.*"
+    - python: 3.6
+      env: DJANGO="==1.9.*"
     - python: 3.6
-      env: DJANGO=1.9.*
+      env: DJANGO="==1.10.*"
     - python: 3.6
-      env: DJANGO=1.10.*
+      env: DJANGO="==1.11.*"
     - python: 3.6
-      env: DJANGO=1.11.*
+      env: DJANGO="==2.0.*"
     - python: 3.6
-      env: DJANGO=2.0.*
+      env: DJANGO="==2.1.*"
     - python: 3.6
-      env: DJANGO=2.1.*
+      env: DJANGO="==2.2.*"
+    - python: 3.6
+      env: DJANGO=">=3.0a1,<3.1"
+
+    - python: 3.7
+      env: DJANGO="==2.0.*"
+    - python: 3.7
+      env: DJANGO="==2.1.*"
+    - python: 3.7
+      env: DJANGO="==2.2.*"
+    - python: 3.7
+      env: DJANGO=">=3.0a1,<3.1"
 
     - os: osx
       language: generic
-      env: DJANGO=1.10.*
+      env: DJANGO="==1.10.*"
 
 # Perform the manual steps on OSX to install Python3 and activate venv:
 # Since Python versions have been tested on Linux and it is only a matter of
@@ -60,7 +75,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source env/bin/activate    ; fi
 
 install:
-  - pip install -q Django==$DJANGO
+  - pip install -q django$DJANGO
   - python setup.py install
 
 script: python runtests.py

runtests.py

@@ -30,11 +30,20 @@
         },
     }],
     ROOT_URLCONF='martor.tests.urls',
-    INSTALLED_APPS=['django.contrib.auth',
-                    'django.contrib.contenttypes',
-                    'django.contrib.sessions',
-                    'django.contrib.admin',
-                    'martor'])
+    INSTALLED_APPS=[
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+        'django.contrib.messages',
+        'django.contrib.admin',
+        'martor'
+    ],
+    MIDDLEWARE=[
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ],
+)
 
 try:
     # Django <= 1.8