Return 404 for unsupported languages in ssi_included views,

[django-ssify.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 421e095..0daa6e6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -3,117 +3,31 @@
 #
 [tox]
 envlist=clear,
-    d15-py26, d15-py27, d15-py32, d15-py33,
-    d16-py26, d16-py27, d16-py32, d16-py33,
-    d17-py27, d17-py32, d17-py33, d17-py34,
-    dd-py27, dd-py32, dd-py33, dd-py34,
+    d1{5,6}-py{26,27,32,33},
+    d{17,d}-py{27,32,33,34},
     stats
 
 [testenv]
-indexserver=http://py.mdrn.pl
+indexserver=https://py.mdrn.pl:8443
 commands=coverage run --source=ssify --append --branch runtests.py
-deps=coverage
+deps=
+    d15: Django>=1.5,<1.6
+    d16: Django>=1.6,<1.7
+    d17: Django>=1.7,<1.8
+    dd: https://github.com/django/django/zipball/master
+    coverage
+basepython=
+    py26: python2.6
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+    py34: python3.4
 
 [testenv:clear]
+basepython=python3.4
 commands=coverage erase
 
 [testenv:stats]
-commands=coverage html
-
-[base]
-
-[testenv:d15-py26]
-basepython=python2.6
-deps=
-    Django>=1.5,<1.6
-    {[testenv]deps}
-
-[testenv:d15-py27]
-basepython=python2.7
-deps=
-    Django>=1.5,<1.6
-    {[testenv]deps}
-
-[testenv:d15-py32]
-basepython=python3.2
-deps=
-    Django>=1.5,<1.6
-    {[testenv]deps}
-
-[testenv:d15-py33]
-basepython=python3.3
-deps=
-    Django>=1.5,<1.6
-    {[testenv]deps}
-
-[testenv:d16-py26]
-basepython=python2.6
-deps=
-    Django>=1.6,<1.7
-    {[testenv]deps}
-
-[testenv:d16-py27]
-basepython=python2.7
-deps=
-    Django>=1.6,<1.7
-    {[testenv]deps}
-
-[testenv:d16-py32]
-basepython=python3.2
-deps=
-    Django>=1.6,<1.7
-    {[testenv]deps}
-
-[testenv:d16-py33]
-basepython=python3.3
-deps=
-    Django>=1.6,<1.7
-    {[testenv]deps}
-
-[testenv:d17-py27]
-basepython=python2.7
-deps=
-    https://www.djangoproject.com/download/1.7c3/tarball/
-    {[testenv]deps}
-
-[testenv:d17-py32]
-basepython=python3.2
-deps=
-    Django>=1.7,<1.8
-    {[testenv]deps}
-
-[testenv:d17-py33]
-basepython=python3.3
-deps=
-    Django>=1.7,<1.8
-    {[testenv]deps}
-
-[testenv:d17-py34]
 basepython=python3.4
-deps=
-    Django>=1.7,<1.8
-    {[testenv]deps}
-
-[testenv:dd-py27]
-basepython=python2.7
-deps=
-    https://github.com/django/django/zipball/master
-    {[testenv]deps}
-
-[testenv:dd-py32]
-basepython=python3.2
-deps=
-    https://github.com/django/django/zipball/master
-    {[testenv]deps}
-
-[testenv:dd-py33]
-basepython=python3.3
-deps=
-    https://github.com/django/django/zipball/master
-    {[testenv]deps}
+commands=coverage html
 
-[testenv:dd-py34]
-basepython=python3.4
-deps=
-    https://github.com/django/django/zipball/master
-    {[testenv]deps}