From 92dac48c99905d3594afd83dd6acacbb833336f8 Mon Sep 17 00:00:00 2001 From: Steve Lamb Date: Tue, 16 Jun 2015 11:09:08 -0400 Subject: [PATCH 1/2] Install django from env before requirements.txt This is necessary because there are cases where a dependency will grab a version of django that satisfies a broad requirement (>1.5), but won't honor the locked version in the env_var. The particular problem was that djqscsv was pulling down django1.8 during the python2.6 job, which fails to run. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13bc8c7..bac676a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ matrix: - python: "2.6" env: DJANGO=1.7 RUNNER="python" SUCCESS="echo DONE" install: - - pip install -r dev_requirements.txt --use-mirrors + - pip install -q Django==$DJANGO + - pip install -r dev_requirements.txt - python setup.py install - - pip install -q Django==$DJANGO --use-mirrors script: - $RUNNER test_app/manage.py test djqscsv_tests after_success: From 69321ff25c9e9014efcfb42c22d8613f571fee6b Mon Sep 17 00:00:00 2001 From: Steve Lamb Date: Tue, 16 Jun 2015 11:11:17 -0400 Subject: [PATCH 2/2] Test against django 1.8 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index bac676a..02a4d5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,13 @@ env: - DJANGO=1.5 RUNNER="coverage run --source=djqscsv" SUCCESS="coveralls" - DJANGO=1.6 RUNNER="python" SUCCESS="echo DONE" - DJANGO=1.7 RUNNER="python" SUCCESS="echo DONE" + - DJANGO=1.8 RUNNER="python" SUCCESS="echo DONE" matrix: exclude: - python: "2.6" env: DJANGO=1.7 RUNNER="python" SUCCESS="echo DONE" + - python: "2.6" + env: DJANGO=1.8 RUNNER="python" SUCCESS="echo DONE" install: - pip install -q Django==$DJANGO - pip install -r dev_requirements.txt