aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTom Christie2013-02-01 14:03:28 +0000
committerTom Christie2013-02-01 14:03:28 +0000
commitf4f237e3ee02fef4fd5f389bf4fb3bbdd00173bd (patch)
tree80b5d9b042e0d66fa16cfe071a2a345cd4fdfdd6 /tox.ini
parentd9c7b1c58523d63c8118d88f44ebfdf5f35e942a (diff)
downloaddjango-rest-framework-f4f237e3ee02fef4fd5f389bf4fb3bbdd00173bd.tar.bz2
3.2, 3.3 compat
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini32
1 files changed, 22 insertions, 10 deletions
diff --git a/tox.ini b/tox.ini
index 22c85e49..542d5930 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,28 +1,33 @@
[tox]
downloadcache = {toxworkdir}/cache/
-envlist = py2.7-django1.5,py2.7-django1.4,py2.7-django1.3,py2.6-django1.5,py2.6-django1.4,py2.6-django1.3
+envlist = py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.7-django1.4,py2.7-django1.3,py2.6-django1.5,py2.6-django1.4,py2.6-django1.3
[testenv]
commands = {envpython} rest_framework/runtests/runtests.py
-[testenv:py2.7-django1.5]
-basepython = python2.7
-deps = https://github.com/django/django/zipball/master
+[testenv:py3.3-django1.5]
+basepython = python3.3
+deps = https://www.djangoproject.com/download/1.5c1/tarball/
django-filter==0.5.4
-[testenv:py2.7-django1.4]
-basepython = python2.7
-deps = django==1.4.3
+[testenv:py3.2-django1.5]
+basepython = python3.2
+deps = https://www.djangoproject.com/download/1.5c1/tarball/
django-filter==0.5.4
-[testenv:py2.7-django1.3]
+[testenv:py2.7-django1.5]
basepython = python2.7
-deps = django==1.3.5
+deps = https://www.djangoproject.com/download/1.5c1/tarball/
django-filter==0.5.4
[testenv:py2.6-django1.5]
basepython = python2.6
-deps = https://github.com/django/django/zipball/master
+deps = https://www.djangoproject.com/download/1.5c1/tarball/
+ django-filter==0.5.4
+
+[testenv:py2.7-django1.4]
+basepython = python2.7
+deps = django==1.4.3
django-filter==0.5.4
[testenv:py2.6-django1.4]
@@ -30,7 +35,14 @@ basepython = python2.6
deps = django==1.4.3
django-filter==0.5.4
+[testenv:py2.7-django1.3]
+basepython = python2.7
+deps = django==1.3.5
+ django-filter==0.5.4
+ six
+
[testenv:py2.6-django1.3]
basepython = python2.6
deps = django==1.3.5
django-filter==0.5.4
+ six