aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorXavier Ordoquy2014-01-28 07:40:13 +0100
committerXavier Ordoquy2014-01-28 07:40:13 +0100
commit12d05630821b126f61dff74c0193132187f4f74c (patch)
tree9452497915f2281c9a1032e0bc59bf404165062c /.travis.yml
parent0383f11ff747b1236f7ca25e95a3652a1bbebb14 (diff)
downloaddjango-rest-framework-12d05630821b126f61dff74c0193132187f4f74c.tar.bz2
Updated the django-filter version and added tests against Django 1.7a1
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 18fe66ab..84a15b15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
- "3.3"
env:
+ - DJANGO="https://www.djangoproject.com/download/1.7a1/tarball/"
- DJANGO="django==1.6"
- DJANGO="django==1.5.5"
- DJANGO="django==1.4.10"
@@ -20,7 +21,7 @@ install:
- "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"
+ - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi"
- export PYTHONPATH=.
script:
@@ -28,6 +29,8 @@ script:
matrix:
exclude:
+ - python: "2.6"
+ env: DJANGO="https://www.djangoproject.com/download/1.7a1/tarball/"
- python: "3.2"
env: DJANGO="django==1.4.10"
- python: "3.2"