aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2013-10-23 09:10:44 +0200
committerAymeric Augustin2013-10-23 09:11:43 +0200
commitf868f1985923672ebd2d6d5988d8c0a15ed88fe7 (patch)
tree2463b014ee9ea3af5e14b3e6cb95825f474637dc
parent75df680f6e0fda6a603e64627a71e187ca117bd6 (diff)
downloaddjango-debug-toolbar-f868f1985923672ebd2d6d5988d8c0a15ed88fe7.tar.bz2
Add Django 1.6 RC to tox combinations.
-rw-r--r--tox.ini23
1 files changed, 22 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 384bc31..cfb8b5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,10 @@ envlist =
py26-django15,
py27-django15,
py32-django15,
- py33-django15
+ py33-django15,
+ py27-django16,
+ py32-django16,
+ py33-django16
[testenv]
commands = python runtests.py
@@ -47,3 +50,21 @@ basepython = python3.3
deps =
Django>=1.5,<1.6
{[testenv]deps}
+
+[testenv:py27-django16]
+basepython = python2.7
+deps =
+ https://www.djangoproject.com/download/1.6c1/tarball/
+ {[testenv]deps}
+
+[testenv:py32-django16]
+basepython = python3.2
+deps =
+ https://www.djangoproject.com/download/1.6c1/tarball/
+ {[testenv]deps}
+
+[testenv:py33-django16]
+basepython = python3.3
+deps =
+ https://www.djangoproject.com/download/1.6c1/tarball/
+ {[testenv]deps}