From 5a1cceced4a23d1f4759fb77d40a8382bbb71942 Mon Sep 17 00:00:00 2001
From: Piet Delport <pjdelport@gmail.com>
Date: Thu, 2 Aug 2012 12:23:21 +0200
Subject: [PATCH] Tox: Update for Django 1.4.

---
 tox.ini | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1585489..d4581a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-        py2.6-django1.2,py2.6-django1.3,
-        py2.7-django1.2,py2.7-django1.3
+        py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,
+        py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,
 
 [testenv]
 commands = python -Wall setup.py test
@@ -12,7 +12,11 @@ deps = Django>=1.2,<1.3
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
-deps = Django>=1.3
+deps = Django>=1.3,<1.4
+
+[testenv:py2.6-django1.4]
+basepython = python2.6
+deps = Django>=1.4,<1.5
 
 [testenv:py2.7-django1.2]
 basepython = python2.7
@@ -20,4 +24,8 @@ deps = Django>=1.2,<1.3
 
 [testenv:py2.7-django1.3]
 basepython = python2.7
-deps = Django>=1.3
+deps = Django>=1.3,<1.4
+
+[testenv:py2.7-django1.4]
+basepython = python2.7
+deps = Django>=1.4,<1.5