test matrix changes

jazzband · Feb 3, 2018 · 321ad29 · 321ad29
1 parent 5ad3329
commit 321ad29
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,19 +4,16 @@ python: 3.6
 env:
   matrix:
    - TOX_ENV=py27-django111-backendBasic
+   - TOX_ENV=py27-django111-backendAllauth
    - TOX_ENV=py34-django111-backendBasic
+   - TOX_ENV=py34-django111-backendAllauth
    - TOX_ENV=py35-django111-backendBasic
    - TOX_ENV=py36-django111-backendBasic
    - TOX_ENV=py34-django20-backendBasic
-   - TOX_ENV=py35-django20-backendBasic
-   - TOX_ENV=py36-django20-backendBasic
-
-   - TOX_ENV=py27-django111-backendAllauth
-   - TOX_ENV=py34-django111-backendAllauth
-   - TOX_ENV=py35-django111-backendAllauth
-   - TOX_ENV=py36-django111-backendAllauth
    - TOX_ENV=py34-django20-backendAllauth
+   - TOX_ENV=py35-django20-backendBasic
    - TOX_ENV=py35-django20-backendAllauth
+   - TOX_ENV=py36-django20-backendBasic
    - TOX_ENV=py36-django20-backendAllauth
    - TOX_ENV=flake8
 
@@ -25,19 +22,19 @@ matrix:
   include:
     - python: "3.5"
       env: TOX_ENV=py35-django111-backendBasic
-    - python: "3.5"
-      env: TOX_ENV=py35-django20-backendBasic
     - python: "3.5"
       env: TOX_ENV=py35-django111-backendAllauth
+    - python: "3.5"
+      env: TOX_ENV=py35-django20-backendBasic
     - python: "3.5"
       env: TOX_ENV=py35-django20-backendAllauth
   exclude:
     - python: "3.6"
       env: TOX_ENV=py35-django111-backendBasic
-    - python: "3.6"
-      env: TOX_ENV=py35-django20-backendBasic
     - python: "3.6"
       env: TOX_ENV=py35-django111-backendAllauth
+    - python: "3.6"
+      env: TOX_ENV=py35-django20-backendBasic
     - python: "3.6"
       env: TOX_ENV=py35-django20-backendAllauth
 

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,17 @@
 [tox]
-envlist = py{27,33,34,35,36}-django{1.10,1.11,2.0}-backend{Basic,Allauth}
+envlist =
+  py27-django111-backend{Basic,Allauth}
+  py34-django{111,20}-backend{Basic,Allauth}
+  py35-django{111,20}-backend{Basic,Allauth}
+  py36-django{111,20}-backend{Basic,Allauth}
+  flake8
 
 [pytest]
 python_files = tests.py test_*.py
 
 [testenv]
 deps =
   -rrequirements.txt
-  django110: Django<1.11
   django111: Django<2
   django20: Django>=2.0a1,<2.1
   backendAllauth: django-allauth
@@ -25,3 +29,9 @@ commands=flake8 invitations
 [flake8]
 exclude = invitations/migrations/*
 
+
+
+  py27-django111
+  py34-django{111,20}
+  py35-django{111,20}
+  py36-django{111,20,master}