Update tox.ini

pinax · Jul 23, 2016 · 5311c89 · 5311c89
1 parent c60014b
commit 5311c89
Showing 1 changed file with 12 additions and 88 deletions.
diff --git a/tox.ini b/tox.ini
@@ -2,103 +2,27 @@
 ignore = E265,E501
 max-line-length = 100
 max-complexity = 10
+exclude = migrations/*,docs/*
 
 [tox]
 envlist =
-    py26-1.6,
-    py27-1.6, py27-1.7, py27-master,
-    py32-1.6, py32-1.7, py32-master,
-    py33-1.6, py33-1.7, py33-master,
-    py34-1.7, py34-master
+    py27-{1.8,1.9,master},
+    py33-{1.8},
+    py34-{1.8,1.9,master},
+    py35-{1.8,1.9,master}
 
 [testenv]
 deps =
-    flake8 == 2.3.0
-    coverage == 3.7.1
+    coverage==4.0.2
+    flake8==2.5.0
+    1.8: Django>=1.8,<1.9
+    1.9: Django>=1.9,<1.10
+    master: https://github.com/django/django/tarball/master
 usedevelop = True
 setenv =
    LANG=en_US.UTF-8
    LANGUAGE=en_US:en
    LC_ALL=en_US.UTF-8
 commands =
-  coverage run setup.py test
-  coverage report -m
-  flake8 pinax
-
-[testenv:py26-1.6]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py27-1.7]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django<1.8
-
-[testenv:py27-1.6]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py27-master]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
-
-[testenv:py32-1.7]
-basepython = python3.2
-deps =
-    {[testenv]deps}
-    Django<1.8
-
-[testenv:py32-1.6]
-basepython = python3.2
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py32-master]
-basepython = python3.2
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
-
-[testenv:py33-1.7]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django<1.8
-
-[testenv:py33-1.6]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py33-master]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
-
-[testenv:py34-1.7]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django<1.8
-
-[testenv:py34-1.6]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py34-master]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
+    flake8 pinax
+    coverage run setup.py test