Revise tox matrix (base on Django version, not python version) and ad…

…d Django master to test matrix
zostera · Aug 18, 2017 · b158f43 · b158f43
1 parent 8d0c074
commit b158f43
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/testsettings.py b/testsettings.py
@@ -23,7 +23,10 @@
     'bootstrap3',
 )
 
-MIDDLEWARE_CLASSES = DEFAULT_SETTINGS.MIDDLEWARE_CLASSES
+try:
+    MIDDLEWARE_CLASSES = DEFAULT_SETTINGS.MIDDLEWARE_CLASSES
+except AttributeError:
+    pass
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',

diff --git a/tox.ini b/tox.ini
@@ -2,11 +2,10 @@
 minversion = 1.8.0
 envlist =
     coverage-clean
-    py27-django{18,19,110,111}
-    py33-django{18}
-    py34-django{18,19,110,111}
-    py35-django{19,110,111}
-    py36-django{110,111}
+    {py27,py33,py34,py35}-django18
+    {py27,py34,py35}-django{19,110},
+    {py27,py34,py35,py36}-django111,
+    {py35,py36}-djangomaster
     coverage-report
     flake8
     docs
@@ -19,6 +18,7 @@ deps =
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:coverage-clean]
 commands = coverage erase