fix django 1.6 compatibility
This commit is contained in:
parent
d58bfacf10
commit
93a16087ca
3 changed files with 66 additions and 34 deletions
11
.travis.yml
11
.travis.yml
|
@ -9,17 +9,16 @@ env:
|
|||
- DJANGO='1.7'
|
||||
|
||||
install:
|
||||
- if [[ $DJANGO == '1.6' ]]; then pip install django==1.6; fi
|
||||
- if [[ $DJANGO != '1.6' ]]; then pip install -e git+git://github.com/django/django.git@1.7c2#egg=django1.7rc2; fi
|
||||
- if [[ $DJANGO == '1.6' && $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install django==1.6; fi
|
||||
- pip install -r requirements.txt
|
||||
- if [[ $DJANGO == '1.6' ]]; then pip install coveralls; fi
|
||||
- if [[ $DJANGO == '1.6' && $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install coveralls; fi
|
||||
|
||||
script:
|
||||
- if [[ $DJANGO == '1.6' ]]; then coverage run --branch --source=accounts,permissions,tracker --omit=accounts/migrations/*.py,permissions/migrations/*.py,tracker/migrations/*.py manage.py test; fi
|
||||
- if [[ $DJANGO != '1.6' ]]; then python manage.py test; fi
|
||||
- if [[ $DJANGO == '1.6' && $TRAVIS_PYTHON_VERSION == 3.4 ]]; then coverage run --branch --source=accounts,permissions,tracker --omit=accounts/migrations/*.py,permissions/migrations/*.py,tracker/migrations/*.py manage.py test; fi
|
||||
- if [[ $DJANGO != '1.6' || $TRAVIS_PYTHON_VERSION != 3.4 ]]; then python manage.py test; fi
|
||||
|
||||
after_success:
|
||||
if [[ $DJANGO == '1.6' ]]; then coveralls; fi
|
||||
if [[ $DJANGO == '1.6' && $TRAVIS_PYTHON_VERSION == 3.4 ]]; then coveralls; fi
|
||||
|
||||
notifications:
|
||||
irc:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue