improved test matrix

Author: synasius

.travis.yml

@@ -17,6 +17,13 @@ env:
   - TOX_ENV=py35-django19
   - TOX_ENV=docs
 
+matrix:
+  include:
+    - python: 3.5
+      env:
+        - TOX_ENV=py35-django18
+        - TOX_ENV=py35-django19
+
 install:
   - pip install tox
   - pip install coveralls

requirements/testing.txt

@@ -1,3 +1,2 @@
 -r optional.txt
-coverage
 mock==1.0.1

tox.ini

@@ -9,82 +9,14 @@ envlist =
     flake8
 
 [testenv]
-downloadcache = {toxworkdir}/cache/
 commands=coverage run -a runtests.py
 deps =
-    -r{toxinidir}/requirements/testing.txt
-
-[testenv:py27-django17]
-basepython = python2.7
-deps =
-    Django<1.8
-    {[testenv]deps}
-
-[testenv:py27-django18]
-basepython = python2.7
-deps =
-    Django<1.9
-    {[testenv]deps}
-
-[testenv:py27-django19]
-basepython = python2.7
-deps =
-    git+https://github.com/django/django.git@stable/1.9.x#egg=Django
-    {[testenv]deps}
-
-[testenv:py32-django17]
-basepython = python3.2
-deps =
-    Django<1.8
-    {[testenv]deps}
-
-[testenv:py32-django18]
-basepython = python3.2
-deps =
-    Django<1.9
-    {[testenv]deps}
-
-[testenv:py33-django17]
-basepython = python3.3
-deps =
-    Django<1.8
-    {[testenv]deps}
-
-[testenv:py33-django18]
-basepython = python3.3
-deps =
-    Django<1.9
-    {[testenv]deps}
-
-[testenv:py34-django17]
-basepython = python3.4
-deps =
-    Django<1.8
-    {[testenv]deps}
-
-[testenv:py34-django18]
-basepython = python3.4
-deps =
-    Django<1.9
-    {[testenv]deps}
-
-[testenv:py34-django19]
-basepython = python3.4
-deps =
-    git+https://github.com/django/django.git@stable/1.9.x#egg=Django
-    {[testenv]deps}
-
-[testenv:py35-django18]
-basepython = python3.5
-deps =
-    Django<1.9
-    {[testenv]deps}
-
-[testenv:py35-django19]
-basepython = python3.5
-deps =
-    git+https://github.com/django/django.git@stable/1.9.x#egg=Django
-    {[testenv]deps}
+    django17: Django==1.7.10
+    django18: Django==1.8.6
+    django19: https://www.djangoproject.com/download/1.9rc1/tarball/
+    py32: coverage<4
+    py{27,33,34,35}: coverage
+    -rrequirements/testing.txt
 
 [testenv:docs]
 basepython=python