encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 58c121d6e4 into 015a8122c7

Browse Source
This commit is contained in:
Omer Katz 2014-09-10 07:19:58 +00:00
commit 2ca01e59f7
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -22,7 +22,10 @@ env:
- TOX_ENV=py2.6-django1.4 - TOX_ENV=py2.6-django1.4
install: install:
- "pip install tox --download-cache $HOME/.pip-cache" - "travis_retry pip install tox --download-cache $HOME/.pip-cache"
script: script:
- tox -e $TOX_ENV - tox -e $TOX_ENV
matrix:
fast_finish: true

32
tox.ini
View File

@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly
[testenv:py3.4-django1.7] [testenv:py3.4-django1.7]
basepython = python3.4 basepython = python3.4
deps = Django==1.7 deps = Django>=1.7.0,<1.8.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -26,7 +26,7 @@ deps = Django==1.7
[testenv:py3.3-django1.7] [testenv:py3.3-django1.7]
basepython = python3.3 basepython = python3.3
deps = Django==1.7 deps = Django>=1.7.0,<1.8.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -34,7 +34,7 @@ deps = Django==1.7
[testenv:py3.2-django1.7] [testenv:py3.2-django1.7]
basepython = python3.2 basepython = python3.2
deps = Django==1.7 deps = Django>=1.7.0,<1.8.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -42,7 +42,7 @@ deps = Django==1.7
[testenv:py2.7-django1.7] [testenv:py2.7-django1.7]
basepython = python2.7 basepython = python2.7
deps = Django==1.7 deps = Django>=1.7.0,<1.8.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
# django-oauth-plus==2.2.1 # django-oauth-plus==2.2.1
@ -54,7 +54,7 @@ deps = Django==1.7
[testenv:py3.4-django1.6] [testenv:py3.4-django1.6]
basepython = python3.4 basepython = python3.4
deps = Django==1.6.3 deps = Django>=1.6.0,<1.7.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -62,7 +62,7 @@ deps = Django==1.6.3
[testenv:py3.3-django1.6] [testenv:py3.3-django1.6]
basepython = python3.3 basepython = python3.3
deps = Django==1.6.3 deps = Django>=1.6.0,<1.7.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -70,7 +70,7 @@ deps = Django==1.6.3
[testenv:py3.2-django1.6] [testenv:py3.2-django1.6]
basepython = python3.2 basepython = python3.2
deps = Django==1.6.3 deps = Django>=1.6.0,<1.7.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -78,7 +78,7 @@ deps = Django==1.6.3
[testenv:py2.7-django1.6] [testenv:py2.7-django1.6]
basepython = python2.7 basepython = python2.7
deps = Django==1.6.3 deps = Django>=1.6.0,<1.7.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1
@ -90,7 +90,7 @@ deps = Django==1.6.3
[testenv:py2.6-django1.6] [testenv:py2.6-django1.6]
basepython = python2.6 basepython = python2.6
deps = Django==1.6.3 deps = Django>=1.6.0,<1.7.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1
@ -102,7 +102,7 @@ deps = Django==1.6.3
[testenv:py3.4-django1.5] [testenv:py3.4-django1.5]
basepython = python3.4 basepython = python3.4
deps = django==1.5.6 deps = Django>=1.5.0,<1.6.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -110,7 +110,7 @@ deps = django==1.5.6
[testenv:py3.3-django1.5] [testenv:py3.3-django1.5]
basepython = python3.3 basepython = python3.3
deps = django==1.5.6 deps = Django>=1.5.0,<1.6.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -118,7 +118,7 @@ deps = django==1.5.6
[testenv:py3.2-django1.5] [testenv:py3.2-django1.5]
basepython = python3.2 basepython = python3.2
deps = django==1.5.6 deps = Django>=1.5.0,<1.6.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
@ -126,7 +126,7 @@ deps = django==1.5.6
[testenv:py2.7-django1.5] [testenv:py2.7-django1.5]
basepython = python2.7 basepython = python2.7
deps = django==1.5.6 deps = Django>=1.5.0,<1.6.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1
@ -138,7 +138,7 @@ deps = django==1.5.6
[testenv:py2.6-django1.5] [testenv:py2.6-django1.5]
basepython = python2.6 basepython = python2.6
deps = django==1.5.6 deps = Django>=1.5.0,<1.6.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1
@ -150,7 +150,7 @@ deps = django==1.5.6
[testenv:py2.7-django1.4] [testenv:py2.7-django1.4]
basepython = python2.7 basepython = python2.7
deps = django==1.4.11 deps = Django>=1.4.0,<1.5.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1
@ -162,7 +162,7 @@ deps = django==1.4.11
[testenv:py2.6-django1.4] [testenv:py2.6-django1.4]
basepython = python2.6 basepython = python2.6
deps = django==1.4.11 deps = Django>=1.4.0,<1.5.0
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1