Cleanup

tcarlander · Mar 23, 2017 · 412615a · 412615a
2 parents 7957c7d + 8e33f2f
commit 412615a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,22 +2,27 @@ language: python
 python:
   - "3.4"
   - "3.5"
-  - "3.6-dev" # 3.6 development branch
+  - "3.6" # 3.6 development branch
 
+env:
+  - DJANGO=1.8
+  - DJANGO=1.9
+  - DJANGO=1.10
+  - DJANGO=1.11
 
 before_install:
     - pip install pytest
     - export DJANGO_SETTINGS_MODULE=crowdtest.settings
     - export PYTHONPATH=$HOME/builds/WFP-BKK/django-crowd-sso
 
-# command to install dependencies
-
 install:
-  #- pip install -q Django==$DJANGO_VERSION djangorestframework
    -  pip install tox-travis coveralls
-  #- python setup.py -q install
-  # command to run tests
+
 script:
   - tox
+
 after_success:
-    - coveralls
+  - coveralls
+matrix:
+  allow_failures:
+    - env: DJANGO=1.8
diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,25 @@
 [tox]
-envlist = py{34,35,36}-django{18,19,110,master}
+envlist = py{34,35,36}-django{18,19,110,111}
 
-[tox:travis]
-3.4 = py34
-3.5 = py35
-3.6-dev = py36
+[travis]
+python =
+    3.4: py34
+    3.5: py35
+    3.6: py36
+
+[travis:env]
+DJANGO =
+    1.8: django18
+    1.9: django19
+    1.10: django110
+    1.11: django111
 
 [testenv]
 deps =
-    django18: Django <19
+    django18: Django <1.9
     django19: Django >=1.9,<1.10
     django110: Django >=1.10,<1.11
+    django111: Django >=1.11<1.12
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     requests
     djangorestframework