diff --git a/.zuul.yaml b/.zuul.yaml index ff757fe..7210127 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,14 +1,9 @@ - project: templates: - check-requirements + - horizon-non-primary-django-jobs - openstack-lower-constraints-jobs - 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 c31602d..4f7796f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py37,py36,py27,pep8 +envlist = py37,py36,py27,py3-{dj111,dj22},pep8 skipsdist = True [testenv] @@ -18,6 +18,8 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = + dj111: pip install django>=1.11,<2 + dj22: pip install django>=2.2,<2.3 rm -f .testrepository/times.dbm find . -type f -name "*.pyc" -delete find . -type d -name "__pycache__" -delete @@ -33,12 +35,6 @@ commands = flake8 basepython = python3 commands = {posargs} -[testenv:py3-dj111] -basepython = python3 -commands = - pip install django>=1.11,<2 - {[testenv]commands} - [testenv:py27integration] basepython = python2.7 commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}