Merge branch 'master' into default-meta

This commit is contained in:
mongkok 2018-02-03 03:17:11 +05:30
commit be4a6231ae

View File

@ -11,7 +11,7 @@ install:
pip install -e .[test] pip install -e .[test]
pip install psycopg2 # Required for Django postgres fields testing pip install psycopg2 # Required for Django postgres fields testing
pip install django==$DJANGO_VERSION pip install django==$DJANGO_VERSION
if [ $DJANGO_VERSION = 1.8 ]; then # DRF dropped 1.8 support at 3.7.0 if (($(echo "$DJANGO_VERSION <= 1.9" | bc -l))); then # DRF dropped 1.8 and 1.9 support at 3.7.0
pip install djangorestframework==3.6.4 pip install djangorestframework==3.6.4
fi fi
python setup.py develop python setup.py develop