refresh travis/tox matrix

orcasgit · Nov 3, 2016 · 1b23d59 · 1b23d59
1 parent 6671724
commit 1b23d59
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,21 +4,21 @@ env:
   # Avoid testing pypy on travis until the following issue is fixed:
   #   https://github.com/travis-ci/travis-ci/issues/4756
   #- TOX_ENV=pypy-trunk
+  #- TOX_ENV=pypy-1.10.X
   #- TOX_ENV=pypy-1.9.X
   #- TOX_ENV=pypy-1.8.X
-  #- TOX_ENV=pypy-1.7.X
   - TOX_ENV=py35-trunk
+  - TOX_ENV=py35-1.10.X
   - TOX_ENV=py35-1.9.X
   - TOX_ENV=py34-trunk
+  - TOX_ENV=py34-1.10.X
   - TOX_ENV=py34-1.9.X
   - TOX_ENV=py34-1.8.X
-  - TOX_ENV=py34-1.7.X
   - TOX_ENV=py33-1.8.X
-  - TOX_ENV=py33-1.7.X
-  #- TOX_ENV=py27-trunk
+  - TOX_ENV=py27-trunk
+  - TOX_ENV=py27-1.10.X
   - TOX_ENV=py27-1.9.X
   - TOX_ENV=py27-1.8.X
-  - TOX_ENV=py27-1.7.X
 install:
   - pip install coveralls tox
 script: tox -e $TOX_ENV

diff --git a/tox.ini b/tox.ini
@@ -1,34 +1,39 @@
 [tox]
-envlist = pypy-1.9.X, pypy-1.8.X, pypy-1.7.X,
-          py35-trunk, py35-1.9.X,
-          py34-trunk, py34-1.9.X, py34-1.8.X, py34-1.7.X,
-          py33-1.8.X, py33-1.7.X,
-          py27-1.9.X, py27-1.8.X, py27-1.7.X
+envlist = pypy-trunk, pypy-1.10.X, pypy-1.9.X, pypy-1.8.X,
+          py35-trunk, py35-1.10.X, py35-1.9.X,
+          py34-trunk, py34-1.10.X, py34-1.9.X, py34-1.8.X,
+          py33-1.8.X,
+          py27-trunk, py27-1.10.X, py27-1.9.X, py27-1.8.X
 
 [testenv]
 commands = {envpython} run_tests.py
-deps = -r{toxinidir}/requirements/test.txt
+deps = misfit
+       -r{toxinidir}/requirements/test.txt
 
 [djangotrunk]
 deps = https://github.com/django/django/archive/master.zip
        {[testenv]deps}
 
+[django110]
+deps = django>=1.10,<1.11
+       {[testenv]deps}
+
 [django19]
-deps = django>=1.9a1,<1.10
+deps = django>=1.9,<1.10
        {[testenv]deps}
 
 [django18]
 deps = django>=1.8,<1.9
        {[testenv]deps}
 
-[django17]
-deps = django>=1.7,<1.8
-       {[testenv]deps}
-
 [testenv:pypy-trunk]
 basepython = pypy
 deps = {[djangotrunk]deps}
 
+[testenv:pypy-1.10.X]
+basepython = pypy
+deps = {[django110]deps}
+
 [testenv:pypy-1.9.X]
 basepython = pypy
 deps = {[django19]deps}
@@ -37,14 +42,14 @@ deps = {[django19]deps}
 basepython = pypy
 deps = {[django18]deps}
 
-[testenv:pypy-1.7.X]
-basepython = pypy
-deps = {[django17]deps}
-
 [testenv:py35-trunk]
 basepython = python3.5
 deps = {[djangotrunk]deps}
 
+[testenv:py35-1.10.X]
+basepython = python3.5
+deps = {[django110]deps}
+
 [testenv:py35-1.9.X]
 basepython = python3.5
 deps = {[django19]deps}
@@ -53,6 +58,10 @@ deps = {[django19]deps}
 basepython = python3.4
 deps = {[djangotrunk]deps}
 
+[testenv:py34-1.10.X]
+basepython = python3.4
+deps = {[django110]deps}
+
 [testenv:py34-1.9.X]
 basepython = python3.4
 deps = {[django19]deps}
@@ -61,30 +70,22 @@ deps = {[django19]deps}
 basepython = python3.4
 deps = {[django18]deps}
 
-[testenv:py34-1.7.X]
-basepython = python3.4
-deps = {[django17]deps}
-
 [testenv:py33-1.8.X]
 basepython = python3.3
 deps = {[django18]deps}
 
-[testenv:py33-1.7.X]
-basepython = python3.3
-deps = {[django17]deps}
-
 [testenv:py27-trunk]
 basepython = python2.7
 deps = {[djangotrunk]deps}
 
+[testenv:py27-1.10.X]
+basepython = python2.7
+deps = {[django110]deps}
+
 [testenv:py27-1.9.X]
 basepython = python2.7
 deps = {[django19]deps}
 
 [testenv:py27-1.8.X]
 basepython = python2.7
 deps = {[django18]deps}
-
-[testenv:py27-1.7.X]
-basepython = python2.7
-deps = {[django17]deps}