Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
4001cd74
Commit
4001cd74
authored
Mar 07, 2014
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pin pillow to 2.3.0
parent
35787fb3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletions
+13
-1
.travis.yml
+1
-1
optionals.txt
+1
-0
tox.ini
+11
-0
No files found.
.travis.yml
View file @
4001cd74
...
...
@@ -15,7 +15,7 @@ env:
install
:
-
pip install $DJANGO
-
pip install defusedxml==0.3 Pillow
-
pip install defusedxml==0.3 Pillow
==2.3.0
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
oauth2==1.5.211;
fi"
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
django-oauth-plus==2.2.4;
fi"
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
django-oauth2-provider==0.2.4;
fi"
...
...
optionals.txt
View file @
4001cd74
...
...
@@ -5,3 +5,4 @@ django-filter>=0.5.4
django-oauth-plus>=2.2.1
oauth2>=1.5.211
django-oauth2-provider>=0.2.4
Pillow==2.3.0
tox.ini
View file @
4001cd74
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment