diff --git a/.zuul.yaml b/.zuul.yaml index 66c29fd..900882d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,14 +1,9 @@ - project: templates: - check-requirements + - horizon-non-primary-django-jobs - openstack-lower-constraints-jobs-horizon - openstack-python-jobs-horizon - openstack-python3-train-jobs-horizon - publish-openstack-docs-pti - release-notes-jobs-python3 - check: - jobs: - - horizon-openstack-tox-python3-django111 - gate: - jobs: - - horizon-openstack-tox-python3-django111 diff --git a/tox.ini b/tox.ini index 4f8c90f..edbf26a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py36,py37,pep8 +envlist = py27,py36,py37,py3-{dj111,dj22},pep8 minversion = 2.0 skipsdist = True @@ -15,7 +15,10 @@ install_command = pip install {opts} {packages} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = python manage.py test {posargs} --settings=blazar_dashboard.test.settings +commands = + dj111: pip install django>=1.11,<2 + dj22: pip install django>=2.2,<2.3 + python manage.py test {posargs} --settings=blazar_dashboard.test.settings [testenv:pep8] basepython = python3 @@ -33,12 +36,6 @@ commands = coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml' coverage html --omit '.tox/cover/*' -d 'cover/htmlcov' -[testenv:py3-dj111] -basepython = python3 -commands = - pip install django>=1.11,<2 - {[testenv]commands} - [testenv:eslint] basepython = python3 whitelist_externals = npm