Merge "Django 2.0 support"

This commit is contained in:
Zuul 2018-03-27 07:18:51 +00:00 committed by Gerrit Code Review
commit 243b5d81af

View File

@ -1,5 +1,5 @@
[tox]
envlist = pep8,py35,py27,py27dj18
envlist = pep8,py35,py27,py35dj20
minversion = 2.3.2
skipsdist = True
@ -31,10 +31,10 @@ commands =
coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
[testenv:py27dj18]
basepython = python2.7
[testenv:py35dj20]
basepython = python3.5
commands =
pip install django>=1.8,<1.9
pip install django>=2.0,<2.1
python manage.py test {posargs}
[testenv:eslint]