diff options
| author | Xavier Ordoquy | 2013-01-07 22:41:42 +0100 |
|---|---|---|
| committer | Xavier Ordoquy | 2013-01-07 22:41:42 +0100 |
| commit | c1e3b42fee73b47d5aa7330cdf8946657742d6f7 (patch) | |
| tree | c1cfd0606328bcbffd50a1e96a437492e94fb47b | |
| parent | fccf1814f1af153ede074dcdad12f02b407b092d (diff) | |
| download | django-rest-framework-c1e3b42fee73b47d5aa7330cdf8946657742d6f7.tar.bz2 | |
Conditional six installation (only for django 1.3.5) and install 3.2 compatible django-filter for python 3.2 test.
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1ce287c2..e87ca38b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ env: install: - pip install $DJANGO - pip install django-filter==0.5.4 --use-mirrors - - pip install six --use-mirrors + - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade -e git+https://github.com/alex/django-filter.git#egg=django-filter; fi" + - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]] then pip install six --use-mirrors; fi" - export PYTHONPATH=. script: |