Merge pull request #23 from carltongibson/test-fixes

Update Tox and Travis configs

.travis.yml

@@ -1,29 +1,27 @@
+sudo: false
 language: python
 env:
   - TOXENV=flake8-py27
   - TOXENV=flake8-py33
   - TOXENV=py26-dj14
   - TOXENV=py27-dj14
-  - TOXENV=py26-dj15
-  - TOXENV=py26-dj16
-  - TOXENV=py27-dj15
-  - TOXENV=py27-dj16
-  - TOXENV=py32-dj15
-  - TOXENV=py32-dj16
-  - TOXENV=py33-dj15
-  - TOXENV=py33-dj16
   - TOXENV=py27-dj17
   - TOXENV=py27-dj18
   - TOXENV=py27-dj19
   - TOXENV=py32-dj17
   - TOXENV=py32-dj18
-  - TOXENV=py32-dj19
   - TOXENV=py33-dj17
   - TOXENV=py33-dj18
-  - TOXENV=py33-dj19
   - TOXENV=py34-dj17
   - TOXENV=py34-dj18
   - TOXENV=py34-dj19
+  - TOXENV=py35-dj19
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TOXENV=py27-dj19
+    - env: TOXENV=py34-dj19
+    - env: TOXENV=py35-dj19
 install:
   - pip install tox
 script:

tox.ini

@@ -6,8 +6,8 @@ envlist =
     flake8-py27,
     flake8-py33,
     py{26,27}-dj14,
-    py{26,27,32,33}-dj{15,16},
-    py{27,32,33,34}-dj{17,18,19},
+    py{27,32,33,34}-dj{17,18},
+    py{27,34,35}-dj19
 
 [testenv]
 basepython =
@@ -16,6 +16,7 @@ basepython =
     py32: python3.2
     py33: python3.3
     py34: python3.4
+    py35: python3.5
     pypy: pypy
 usedevelop = true
 setenv =
@@ -30,8 +31,8 @@ deps =
     dj15: https://github.com/django/django/archive/stable/1.5.x.zip#egg=django
     dj16: https://github.com/django/django/archive/stable/1.6.x.zip#egg=django
     dj17: https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
-    dj18: https://github.com/django/django/archive/stable/1.8.x.zip#egg=django
-    dj19: https://github.com/django/django/archive/master.zip#egg=django
+    dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
+    dj19: https://github.com/django/django/archive/master.tar.gz#egg=django
 
 commands =
     coverage run {envbindir}/django-admin.py test -v2 {posargs:tests}