aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorXavier Ordoquy2014-05-18 09:27:23 +0200
committerXavier Ordoquy2014-05-18 09:27:23 +0200
commita2e1024f8b0447a712d1f486172d38cfe56535fe (patch)
treefd8daea9cdcee27d1451ffa926836215d8ea42e2 /.travis.yml
parent5c12b0768166376783d62632e562f0c1301ee847 (diff)
downloaddjango-rest-framework-a2e1024f8b0447a712d1f486172d38cfe56535fe.tar.bz2
Updated Django versions.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 0c9b4455..638d1499 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,10 @@ python:
- "3.4"
env:
- - 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="https://www.djangoproject.com/download/1.7b4/tarball/"
+ - DJANGO="django==1.6.5"
+ - DJANGO="django==1.5.8"
+ - DJANGO="django==1.4.13"
- DJANGO="django==1.3.7"
install:
@@ -24,7 +24,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.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"
+ - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7b4/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:
@@ -33,16 +33,16 @@ script:
matrix:
exclude:
- python: "2.6"
- env: DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
+ env: DJANGO="https://www.djangoproject.com/download/1.7b4/tarball/"
- python: "3.2"
- env: DJANGO="django==1.4.11"
+ env: DJANGO="django==1.4.13"
- python: "3.2"
env: DJANGO="django==1.3.7"
- python: "3.3"
- env: DJANGO="django==1.4.11"
+ env: DJANGO="django==1.4.13"
- python: "3.3"
env: DJANGO="django==1.3.7"
- python: "3.4"
- env: DJANGO="django==1.4.11"
+ env: DJANGO="django==1.4.13"
- python: "3.4"
env: DJANGO="django==1.3.7"