aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTom Christie2014-03-07 14:15:56 +0000
committerTom Christie2014-03-07 14:15:56 +0000
commit4001cd74ed46dd8bf56518e2e8f64e6152d4d480 (patch)
treee658becf48957714af9deed9ce22c0dfaf7e714a /tox.ini
parent35787fb3ca3081d13b7e97cd540e3c30a1c90f18 (diff)
downloaddjango-rest-framework-4001cd74ed46dd8bf56518e2e8f64e6152d4d480.tar.bz2
Pin pillow to 2.3.0
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 11 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 77766d20..d25e3140 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,12 +10,14 @@ basepython = python3.3
deps = Django==1.6
django-filter==0.6a1
defusedxml==0.3
+ Pillow==2.3.0
[testenv:py3.2-django1.6]
basepython = python3.2
deps = Django==1.6
django-filter==0.6a1
defusedxml==0.3
+ Pillow==2.3.0
[testenv:py2.7-django1.6]
basepython = python2.7
@@ -26,6 +28,7 @@ deps = Django==1.6
oauth2==1.5.211
django-oauth2-provider==0.2.4
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py2.6-django1.6]
basepython = python2.6
@@ -36,18 +39,21 @@ deps = Django==1.6
oauth2==1.5.211
django-oauth2-provider==0.2.4
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py3.3-django1.5]
basepython = python3.3
deps = django==1.5.5
django-filter==0.6a1
defusedxml==0.3
+ Pillow==2.3.0
[testenv:py3.2-django1.5]
basepython = python3.2
deps = django==1.5.5
django-filter==0.6a1
defusedxml==0.3
+ Pillow==2.3.0
[testenv:py2.7-django1.5]
basepython = python2.7
@@ -58,6 +64,7 @@ deps = django==1.5.5
oauth2==1.5.211
django-oauth2-provider==0.2.3
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py2.6-django1.5]
basepython = python2.6
@@ -68,6 +75,7 @@ deps = django==1.5.5
oauth2==1.5.211
django-oauth2-provider==0.2.3
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py2.7-django1.4]
basepython = python2.7
@@ -78,6 +86,7 @@ deps = django==1.4.10
oauth2==1.5.211
django-oauth2-provider==0.2.3
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py2.6-django1.4]
basepython = python2.6
@@ -88,6 +97,7 @@ deps = django==1.4.10
oauth2==1.5.211
django-oauth2-provider==0.2.3
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py2.7-django1.3]
basepython = python2.7
@@ -98,6 +108,7 @@ deps = django==1.3.5
oauth2==1.5.211
django-oauth2-provider==0.2.3
django-guardian==1.1.1
+ Pillow==2.3.0
[testenv:py2.6-django1.3]
basepython = python2.6