From 6090f5ba3c8d746150c96c26ef1cc2105f80dcba Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 26 Nov 2014 21:28:01 +0100
Subject: [PATCH] Simplified tox config.

---
 tox.ini | 51 +++++++++------------------------------------------
 1 file changed, 9 insertions(+), 42 deletions(-)

diff --git a/tox.ini b/tox.ini
index 719b3d2..cbe596e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,50 +1,17 @@
 [tox]
 args_are_paths = false
-envlist =
-    py27-1.7, py27-master,
-    py32-1.7, py32-master,
-    py33-1.7, py33-master,
-    py34-1.7, py34-master
+envlist = {py27,py32,py33,py34}-django-{17,master}
 
 [testenv]
+basepython =
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+    py34: python3.4
 usedevelop = true
 commands =
     invoke test {posargs}
-django17 =
-    Django>=1.7,<1.8
+deps =
+    django-17: Django>=1.7,<1.8
+    django-master: https://github.com/django/django/archive/master.zip
     -r{toxinidir}/tests/requirements.txt
-djangomaster =
-    https://github.com/django/django/archive/master.zip
-    -r{toxinidir}/tests/requirements.txt
-
-[testenv:py27-1.7]
-basepython = python2.7
-deps = {[testenv]django17}
-
-[testenv:py27-master]
-basepython = python2.7
-deps = {[testenv]djangomaster}
-
-[testenv:py32-1.7]
-basepython = python3.2
-deps = {[testenv]django17}
-
-[testenv:py32-master]
-basepython = python3.2
-deps = {[testenv]djangomaster}
-
-[testenv:py33-1.7]
-basepython = python3.3
-deps = {[testenv]django17}
-
-[testenv:py33-master]
-basepython = python3.3
-deps = {[testenv]djangomaster}
-
-[testenv:py34-1.7]
-basepython = python3.4
-deps = {[testenv]django17}
-
-[testenv:py34-master]
-basepython = python3.4
-deps = {[testenv]djangomaster}