encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 03:19:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bumped tests against Django from 1.7a2 to 1.7b1

Browse Source
This commit is contained in:
Xavier Ordoquy 2014-03-21 16:37:27 +01:00
parent 17f0871736
commit b04cd57050
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -7,7 +7,7 @@ python:
- "3.3" - "3.3"
env: env:
- DJANGO="https://www.djangoproject.com/download/1.7a2/tarball/" - DJANGO="https://www.djangoproject.com/download/1.7b1/tarball/"
- DJANGO="django==1.6.2" - DJANGO="django==1.6.2"
- DJANGO="django==1.5.5" - DJANGO="django==1.5.5"
- DJANGO="django==1.4.10" - DJANGO="django==1.4.10"
@ -23,7 +23,7 @@ install:
- "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.5.4; fi"
- "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi"
- "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
- "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7a2/tarball/' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7b1/tarball/' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
- export PYTHONPATH=. - export PYTHONPATH=.
script: script:
@ -32,7 +32,7 @@ script:
matrix: matrix:
exclude: exclude:
- python: "2.6" - python: "2.6"
env: DJANGO="https://www.djangoproject.com/download/1.7a2/tarball/" env: DJANGO="https://www.djangoproject.com/download/1.7b1/tarball/"
- python: "3.2" - python: "3.2"
env: DJANGO="django==1.4.10" env: DJANGO="django==1.4.10"
- python: "3.2" - python: "3.2"

6
tox.ini
View File

@ -7,22 +7,22 @@ commands = {envpython} rest_framework/runtests/runtests.py
[testenv:py3.3-django1.7] [testenv:py3.3-django1.7]
basepython = python3.3 basepython = python3.3
deps = https://www.djangoproject.com/download/1.7a2/tarball/
django-filter==0.6a1 django-filter==0.6a1
deps = https://www.djangoproject.com/download/1.7b1/tarball/
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
[testenv:py3.2-django1.7] [testenv:py3.2-django1.7]
basepython = python3.2 basepython = python3.2
deps = https://www.djangoproject.com/download/1.7a2/tarball/
django-filter==0.6a1 django-filter==0.6a1
deps = https://www.djangoproject.com/download/1.7b1/tarball/
defusedxml==0.3 defusedxml==0.3
Pillow==2.3.0 Pillow==2.3.0
[testenv:py2.7-django1.7] [testenv:py2.7-django1.7]
basepython = python2.7 basepython = python2.7
deps = https://www.djangoproject.com/download/1.7a2/tarball/
django-filter==0.6a1 django-filter==0.6a1
deps = https://www.djangoproject.com/download/1.7b1/tarball/
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.2.1 django-oauth-plus==2.2.1
oauth2==1.5.211 oauth2==1.5.211