From 8103e5d94aec413ee21c3bba2acc032dea80a0a3 Mon Sep 17 00:00:00 2001
From: Peter Bittner <peter.bittner@notch-interactive.com>
Date: Mon, 20 Apr 2015 23:59:19 +0200
Subject: [PATCH] Refactor tox.ini with conditional settings

see https://testrun.org/tox/latest/config.html#generating-environments-conditional-settings

Also test Django 1.8 with tox
---
 tox.ini | 71 ++++++++++++---------------------------------------------
 1 file changed, 14 insertions(+), 57 deletions(-)

diff --git a/tox.ini b/tox.ini
index bb082ea..8621a6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,62 +1,19 @@
 [tox]
 envlist =
-        py2.6-django1.4,py2.6-django1.5,py2.6-django1.6,
-        py2.7-django1.4,py2.7-django1.5,py2.7-django1.6,
-        py2.7-django1.7,
-        py3.3-django1.5,py3.3-django1.6,py3.3-django1.7,
-        py3.4-django1.5,py3.4-django1.6,py3.4-django1.7,
+    py{26}-django{14,15,16},
+    py{27}-django{14,15,16,17,18},
+    py{33,34}-django{15,16,17,18},
 
 [testenv]
 commands = python -Wall setup.py test
-
-[testenv:py2.6-django1.4]
-basepython = python2.6
-deps = Django>=1.4,<1.5
-
-[testenv:py2.6-django1.5]
-basepython = python2.6
-deps = Django>=1.5,<1.6
-
-[testenv:py2.6-django1.6]
-basepython = python2.6
-deps = Django>=1.6,<1.7
-
-[testenv:py2.7-django1.4]
-basepython = python2.7
-deps = Django>=1.4,<1.5
-
-[testenv:py2.7-django1.5]
-basepython = python2.7
-deps = Django>=1.5,<1.6
-
-[testenv:py2.7-django1.6]
-basepython = python2.7
-deps = Django>=1.6,<1.7
-
-[testenv:py2.7-django1.7]
-basepython = python2.7
-deps = Django>=1.7,<1.8
-
-[testenv:py3.3-django1.5]
-basepython = python3.3
-deps = Django>=1.7,<1.8
-
-[testenv:py3.3-django1.6]
-basepython = python3.3
-deps = Django>=1.6,<1.7
-
-[testenv:py3.3-django1.7]
-basepython = python3.3
-deps = Django>=1.7,<1.8
-
-[testenv:py3.4-django1.5]
-basepython = python3.4
-deps = Django>=1.7,<1.8
-
-[testenv:py3.4-django1.6]
-basepython = python3.4
-deps = Django>=1.6,<1.7
-
-[testenv:py3.4-django1.7]
-basepython = python3.4
-deps = Django>=1.7,<1.8
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+deps =
+    django14: Django>=1.4,<1.5
+    django15: Django>=1.5,<1.6
+    django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
+    django18: Django>=1.8,<1.9