aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini32
1 files changed, 31 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index d62359a5..27db9a8a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,40 @@
[tox]
downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
+envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
[testenv]
commands = {envpython} rest_framework/runtests/runtests.py
+[testenv:py3.3-django1.6]
+basepython = python3.3
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+ django-filter==0.6a1
+ defusedxml==0.3
+
+[testenv:py3.2-django1.6]
+basepython = python3.2
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+ django-filter==0.6a1
+ defusedxml==0.3
+
+[testenv:py2.7-django1.6]
+basepython = python2.7
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+ django-filter==0.6a1
+ defusedxml==0.3
+ django-oauth-plus==2.0
+ oauth2==1.5.211
+ django-oauth2-provider==0.2.3
+
+[testenv:py2.6-django1.6]
+basepython = python2.6
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+ django-filter==0.6a1
+ defusedxml==0.3
+ django-oauth-plus==2.0
+ oauth2==1.5.211
+ django-oauth2-provider==0.2.3
+
[testenv:py3.3-django1.5]
basepython = python3.3
deps = django==1.5