mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-02-17 03:51:03 +03:00
Merge pull request #1215 from brutasse/versions
Updated versions in tox and travis config
This commit is contained in:
Tom Christie
commit
209f238f42
28
.travis.yml
28
.travis.yml
|
|
@ -7,20 +7,20 @@ python:
|
|||
- "3.3"
|
||||
|
||||
env:
|
||||
- DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/"
|
||||
- DJANGO="django==1.5.1 --use-mirrors"
|
||||
- DJANGO="django==1.4.5 --use-mirrors"
|
||||
- DJANGO="django==1.3.7 --use-mirrors"
|
||||
- DJANGO="django==1.6"
|
||||
- DJANGO="django==1.5.5"
|
||||
- DJANGO="django==1.4.10"
|
||||
- DJANGO="django==1.3.7"
|
||||
|
||||
install:
|
||||
- pip install $DJANGO
|
||||
- pip install defusedxml==0.3
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211 --use-mirrors; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1 --use-mirrors; fi"
|
||||
- "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
|
||||
- "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi"
|
||||
- "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.0; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi"
|
||||
- "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi"
|
||||
- "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6; fi"
|
||||
- export PYTHONPATH=.
|
||||
|
||||
script:
|
||||
|
|
@ -29,11 +29,11 @@ script:
|
|||
matrix:
|
||||
exclude:
|
||||
- python: "3.2"
|
||||
env: DJANGO="django==1.4.5 --use-mirrors"
|
||||
env: DJANGO="django==1.4.10"
|
||||
- python: "3.2"
|
||||
env: DJANGO="django==1.3.7 --use-mirrors"
|
||||
env: DJANGO="django==1.3.7"
|
||||
- python: "3.3"
|
||||
env: DJANGO="django==1.4.5 --use-mirrors"
|
||||
env: DJANGO="django==1.4.10"
|
||||
- python: "3.3"
|
||||
env: DJANGO="django==1.3.7 --use-mirrors"
|
||||
env: DJANGO="django==1.3.7"
|
||||
|
||||
|
|
|
|||
20
tox.ini
20
tox.ini
|
|
@ -7,19 +7,19 @@ commands = {envpython} rest_framework/runtests/runtests.py
|
|||
|
||||
[testenv:py3.3-django1.6]
|
||||
basepython = python3.3
|
||||
deps = https://www.djangoproject.com/download/1.6a1/tarball/
|
||||
deps = Django==1.6
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
|
||||
[testenv:py3.2-django1.6]
|
||||
basepython = python3.2
|
||||
deps = https://www.djangoproject.com/download/1.6a1/tarball/
|
||||
deps = Django==1.6
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
|
||||
[testenv:py2.7-django1.6]
|
||||
basepython = python2.7
|
||||
deps = https://www.djangoproject.com/download/1.6a1/tarball/
|
||||
deps = Django==1.6
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
django-oauth-plus==2.0
|
||||
|
|
@ -29,7 +29,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/
|
|||
|
||||
[testenv:py2.6-django1.6]
|
||||
basepython = python2.6
|
||||
deps = https://www.djangoproject.com/download/1.6a1/tarball/
|
||||
deps = Django==1.6
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
django-oauth-plus==2.0
|
||||
|
|
@ -39,19 +39,19 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/
|
|||
|
||||
[testenv:py3.3-django1.5]
|
||||
basepython = python3.3
|
||||
deps = django==1.5
|
||||
deps = django==1.5.5
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
|
||||
[testenv:py3.2-django1.5]
|
||||
basepython = python3.2
|
||||
deps = django==1.5
|
||||
deps = django==1.5.5
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
|
||||
[testenv:py2.7-django1.5]
|
||||
basepython = python2.7
|
||||
deps = django==1.5
|
||||
deps = django==1.5.5
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
django-oauth-plus==2.0
|
||||
|
|
@ -61,7 +61,7 @@ deps = django==1.5
|
|||
|
||||
[testenv:py2.6-django1.5]
|
||||
basepython = python2.6
|
||||
deps = django==1.5
|
||||
deps = django==1.5.5
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
django-oauth-plus==2.0
|
||||
|
|
@ -71,7 +71,7 @@ deps = django==1.5
|
|||
|
||||
[testenv:py2.7-django1.4]
|
||||
basepython = python2.7
|
||||
deps = django==1.4.3
|
||||
deps = django==1.4.10
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
django-oauth-plus==2.0
|
||||
|
|
@ -81,7 +81,7 @@ deps = django==1.4.3
|
|||
|
||||
[testenv:py2.6-django1.4]
|
||||
basepython = python2.6
|
||||
deps = django==1.4.3
|
||||
deps = django==1.4.10
|
||||
django-filter==0.6a1
|
||||
defusedxml==0.3
|
||||
django-oauth-plus==2.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user