Merge pull request #68 from bee-keeper/feature-django-1.11

Adds testing for 1.10 and 1.11
jazzband · Mar 27, 2017 · 398442f · 398442f
2 parents c7ee5f5 + 807442e
commit 398442f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,34 +1,68 @@
 language: python
+python: 3.5
 
 env:
   matrix:
     - TOX_ENV=py27-django17-backendBasic
     - TOX_ENV=py27-django18-backendBasic
     - TOX_ENV=py27-django19-backendBasic
+    - TOX_ENV=py27-django110-backendBasic
+    - TOX_ENV=py27-django111-backendBasic
+
     - TOX_ENV=py33-django17-backendBasic
     - TOX_ENV=py33-django18-backendBasic
+
     - TOX_ENV=py34-django17-backendBasic
     - TOX_ENV=py34-django18-backendBasic
     - TOX_ENV=py34-django19-backendBasic
+    - TOX_ENV=py34-django110-backendBasic
+    - TOX_ENV=py34-django111-backendBasic
+
+    - TOX_ENV=py35-django18-backendBasic
+    - TOX_ENV=py35-django19-backendBasic
+    - TOX_ENV=py35-django110-backendBasic
+    - TOX_ENV=py35-django111-backendBasic
+
     - TOX_ENV=py27-django17-backendAllauth
     - TOX_ENV=py27-django18-backendAllauth
     - TOX_ENV=py27-django19-backendAllauth
+    - TOX_ENV=py27-django110-backendAllauth
+    - TOX_ENV=py27-django111-backendAllauth
+
     - TOX_ENV=py33-django17-backendAllauth
     - TOX_ENV=py33-django18-backendAllauth
+
     - TOX_ENV=py34-django17-backendAllauth
     - TOX_ENV=py34-django18-backendAllauth
     - TOX_ENV=py34-django19-backendAllauth
+    - TOX_ENV=py34-django110-backendAllauth
+    - TOX_ENV=py34-django111-backendAllauth
+
+    - TOX_ENV=py35-django18-backendAllauth
+    - TOX_ENV=py35-django19-backendAllauth
+    - TOX_ENV=py35-django110-backendAllauth
+    - TOX_ENV=py35-django111-backendAllauth
+
     - TOX_ENV=flake8
+
 matrix:
   include:
     - python: "3.5"
       env: TOX_ENV=py35-django18-backendBasic
-    - python: "3.5"
-      env: TOX_ENV=py35-django18-backendAllauth
     - python: "3.5"
       env: TOX_ENV=py35-django19-backendBasic
+    - python: "3.5"
+      env: TOX_ENV=py35-django110-backendBasic
+    - python: "3.5"
+      env: TOX_ENV=py35-django110-backendBasic
+    - python: "3.5"
+      env: TOX_ENV=py35-django18-backendAllauth
     - python: "3.5"
       env: TOX_ENV=py35-django19-backendAllauth
+    - python: "3.5"
+      env: TOX_ENV=py35-django110-backendAllauth
+    - python: "3.5"
+      env: TOX_ENV=py35-django111-backendAllauth
 
 install:
   - pip install tox

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,14 @@
 [tox]
-envlist = py{27,33,34,35}-django{16,17,18,19}-backend{Basic,Allauth}
+envlist = py{27,33,34,35}-django{16,17,18,19,1.10,1.11}-backend{Basic,Allauth}
 
 [testenv]
 deps =
   -rrequirements.txt
   django17: Django<1.8
   django18: Django<1.9
   django19: Django<1.10
-  django10: Django<1.11
+  django110: Django<1.11
+  django111: Django<2
   backendAllauth: django-allauth
 commands =
   python -V