nicer tox.ini layout

diff --git a/tox.ini b/tox.ini
index eb803231f43be98281d4c0144c54ce892530361b..0e4232bd1e92fa98806851a96f5be831f6da16f2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,61 +1,17 @@
 [tox]
 envlist =
-    py27-django15,
-    py33-django15,
-    py27-django16,
-    py33-django16,
-    py27-django17,
-    py33-django17,
-    py34-django17
+    {py27,py33,py34}-django15,
+    {py27,py33,py34}-django16,
+    {py27,py33,py34}-django17
 
 [testenv]
 commands = python setup.py test
 deps =
+     django15: Django==1.5.11
+     django16: Django==1.6.8
+     django17: Django==1.7.1
      django-model-utils
      Pillow
 
 setenv =
     PYTHONPATH = {toxinidir}
-
-
-[testenv:py27-django15]
-basepython = python2.7
-deps =
-    Django>=1.5,<1.6
-    {[testenv]deps}
-
-[testenv:py33-django15]
-basepython = python3.3
-deps =
-    Django>=1.5,<1.6
-    {[testenv]deps}
-
-[testenv:py27-django16]
-basepython = python2.7
-deps =
-    Django>=1.6,<1.7
-    {[testenv]deps}
-
-[testenv:py33-django16]
-basepython = python3.3
-deps =
-    Django>=1.6,<1.7
-    {[testenv]deps}
-
-[testenv:py27-django17]
-basepython = python2.7
-deps =
-    Django>=1.7,<1.8
-    {[testenv]deps}
-
-[testenv:py33-django17]
-basepython = python3.3
-deps =
-    Django>=1.7,<1.8
-    {[testenv]deps}
-
-[testenv:py34-django17]
-basepython = python3.4
-deps =
-    Django>=1.7,<1.8
-    {[testenv]deps}