aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorXavier Ordoquy2014-04-27 11:52:33 +0200
committerXavier Ordoquy2014-04-27 11:52:33 +0200
commit4a1ef6d4b15c504881662a2667564394cb333b6b (patch)
tree67771b64b19c3fe6fc86fa90b224ba04f272cbd4 /.travis.yml
parentdb4a8e6f6e67877d0c3b99c52f60b75fe59031b7 (diff)
downloaddjango-rest-framework-4a1ef6d4b15c504881662a2667564394cb333b6b.tar.bz2
Updated Django's versions.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 60b48cba..bd6d2539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,10 @@ python:
- "3.3"
env:
- - DJANGO="https://www.djangoproject.com/download/1.7b1/tarball/"
- - DJANGO="django==1.6.2"
- - DJANGO="django==1.5.5"
- - DJANGO="django==1.4.10"
+ - DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
+ - DJANGO="django==1.6.3"
+ - DJANGO="django==1.5.6"
+ - DJANGO="django==1.4.11"
- DJANGO="django==1.3.7"
install:
@@ -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.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 [[ ${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"
+ - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7b2/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=.
script:
@@ -32,13 +32,13 @@ script:
matrix:
exclude:
- python: "2.6"
- env: DJANGO="https://www.djangoproject.com/download/1.7b1/tarball/"
+ env: DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
- python: "3.2"
- env: DJANGO="django==1.4.10"
+ env: DJANGO="django==1.4.11"
- python: "3.2"
env: DJANGO="django==1.3.7"
- python: "3.3"
- env: DJANGO="django==1.4.10"
+ env: DJANGO="django==1.4.11"
- python: "3.3"
env: DJANGO="django==1.3.7"