aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini78
1 files changed, 52 insertions, 26 deletions
diff --git a/tox.ini b/tox.ini
index 855ab0ce..72d156f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,127 +1,153 @@
[tox]
downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,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
+envlist =
+ py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
+ py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
+ py3.4-django1.5,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.4-django1.7]
+basepython = python3.4
+deps = https://www.djangoproject.com/download/1.7c2/tarball/
+ django-filter==0.7
+ defusedxml==0.3
+ Pillow==2.3.0
+
[testenv:py3.3-django1.7]
basepython = python3.3
-deps = https://www.djangoproject.com/download/1.7b1/tarball/
+deps = https://www.djangoproject.com/download/1.7c2/tarball/
django-filter==0.7
defusedxml==0.3
Pillow==2.3.0
[testenv:py3.2-django1.7]
basepython = python3.2
-deps = https://www.djangoproject.com/download/1.7b1/tarball/
+deps = https://www.djangoproject.com/download/1.7c2/tarball/
django-filter==0.7
defusedxml==0.3
Pillow==2.3.0
[testenv:py2.7-django1.7]
basepython = python2.7
-deps = https://www.djangoproject.com/download/1.7b1/tarball/
+deps = https://www.djangoproject.com/download/1.7c2/tarball/
+ django-filter==0.7
+ defusedxml==0.3
+ # django-oauth-plus==2.2.1
+ # oauth2==1.5.211
+ # django-oauth2-provider==0.2.4
+ django-guardian==1.2.3
+ Pillow==2.3.0
+
+[testenv:py3.4-django1.6]
+basepython = python3.4
+deps = Django==1.6.3
django-filter==0.7
defusedxml==0.3
- django-oauth-plus==2.2.1
- oauth2==1.5.211
- django-oauth2-provider==0.2.4
- django-guardian==1.1.1
Pillow==2.3.0
[testenv:py3.3-django1.6]
basepython = python3.3
-deps = Django==1.6
+deps = Django==1.6.3
django-filter==0.7
defusedxml==0.3
Pillow==2.3.0
[testenv:py3.2-django1.6]
basepython = python3.2
-deps = Django==1.6
+deps = Django==1.6.3
django-filter==0.7
defusedxml==0.3
Pillow==2.3.0
[testenv:py2.7-django1.6]
basepython = python2.7
-deps = Django==1.6
+deps = Django==1.6.3
django-filter==0.7
defusedxml==0.3
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.4
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0
[testenv:py2.6-django1.6]
basepython = python2.6
-deps = Django==1.6
+deps = Django==1.6.3
django-filter==0.7
defusedxml==0.3
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.4
- django-guardian==1.1.1
+ django-guardian==1.2.3
+ Pillow==2.3.0
+
+[testenv:py3.4-django1.5]
+basepython = python3.4
+deps = django==1.5.6
+ django-filter==0.7
+ defusedxml==0.3
Pillow==2.3.0
[testenv:py3.3-django1.5]
basepython = python3.3
-deps = django==1.5.5
+deps = django==1.5.6
django-filter==0.7
defusedxml==0.3
Pillow==2.3.0
[testenv:py3.2-django1.5]
basepython = python3.2
-deps = django==1.5.5
+deps = django==1.5.6
django-filter==0.7
defusedxml==0.3
Pillow==2.3.0
[testenv:py2.7-django1.5]
basepython = python2.7
-deps = django==1.5.5
+deps = django==1.5.6
django-filter==0.7
defusedxml==0.3
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.3
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0
[testenv:py2.6-django1.5]
basepython = python2.6
-deps = django==1.5.5
+deps = django==1.5.6
django-filter==0.7
defusedxml==0.3
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.3
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0
[testenv:py2.7-django1.4]
basepython = python2.7
-deps = django==1.4.10
+deps = django==1.4.11
django-filter==0.7
defusedxml==0.3
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.3
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0
[testenv:py2.6-django1.4]
basepython = python2.6
-deps = django==1.4.10
+deps = django==1.4.11
django-filter==0.7
defusedxml==0.3
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.3
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0
[testenv:py2.7-django1.3]
@@ -132,7 +158,7 @@ deps = django==1.3.5
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.3
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0
[testenv:py2.6-django1.3]
@@ -143,5 +169,5 @@ deps = django==1.3.5
django-oauth-plus==2.2.1
oauth2==1.5.211
django-oauth2-provider==0.2.3
- django-guardian==1.1.1
+ django-guardian==1.2.3
Pillow==2.3.0