From 0bccd324ba699f095b9a1e09f80c68de7ab49257 Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Wed, 20 Mar 2013 17:57:50 -0700
Subject: [PATCH] Update tox.ini for Python 3 testing.

---
 tox.ini | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 67 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index 2e186f0..13af4d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,80 @@
 [tox]
-envlist=py26,py26-trunk,py27,py27-trunk
+envlist=py26-1.3,py26-1.4,py26,py26-trunk,py27-1.3,py27-1.4,py27,py27-trunk,py32,py32-trunk,py33,py33-trunk
 
 [testenv]
 deps=
-  django==1.3
-  mock==0.7.2
+  Django==1.5
+  mock==1.0.1
 commands=python runtests.py
 
+[testenv:py26-1.3]
+basepython=python2.6
+deps=
+  Django==1.3.7
+  mock==1.0.1
+
+[testenv:py26-1.4]
+basepython=python2.6
+deps=
+  Django==1.4.5
+  mock==1.0.1
+
 [testenv:py26-trunk]
 basepython=python2.6
 deps=
-  svn+http://code.djangoproject.com/svn/django/trunk#egg=django
-  mock==0.7.2
+  git+git://github.com/django/django#egg=django
+  mock==1.0.1
+
+[testenv:py27-1.3]
+basepython=python2.7
+deps=
+  Django==1.3.7
+  mock==1.0.1
+
+[testenv:py27-1.4]
+basepython=python2.7
+deps=
+  Django==1.4.5
+  mock==1.0.1
 
 [testenv:py27-trunk]
 basepython=python2.7
 deps=
-  svn+http://code.djangoproject.com/svn/django/trunk#egg=django
-  mock==0.7.2
+  git+git://github.com/django/django#egg=django
+  mock==1.0.1
+
+[testenv:py32-1.3]
+basepython=python3.2
+deps=
+  Django==1.3.7
+  mock==1.0.1
+
+[testenv:py32-1.4]
+basepython=python3.2
+deps=
+  Django==1.4.5
+  mock==1.0.1
+
+[testenv:py32-trunk]
+basepython=python3.2
+deps=
+  git+git://github.com/django/django#egg=django
+  mock==1.0.1
+
+[testenv:py33-1.3]
+basepython=python3.3
+deps=
+  Django==1.3.7
+  mock==1.0.1
+
+[testenv:py33-1.4]
+basepython=python3.3
+deps=
+  Django==1.4.5
+  mock==1.0.1
+
+[testenv:py33-trunk]
+basepython=python3.3
+deps=
+  git+git://github.com/django/django#egg=django
+  mock==1.0.1