diff --git a/.zuul.yaml b/.zuul.yaml index 124f14c0d5..e5f8e3ac2d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -15,6 +15,14 @@ vars: tox_envlist: py35dj20 +- job: + name: horizon-openstack-tox-python3-django111 + parent: horizon-openstack-tox-base + vars: + tox_envlist: py3-dj111 + required-projects: + - name: openstack/horizon + - job: name: horizon-selenium-headless parent: horizon-openstack-tox-base @@ -54,13 +62,13 @@ - project: check: jobs: - - horizon-openstack-tox-py35dj20 + - horizon-openstack-tox-python3-django111 - horizon-selenium-headless - horizon-dsvm-tempest-plugin - openstack-tox-lower-constraints gate: jobs: - - horizon-openstack-tox-py35dj20 + - horizon-openstack-tox-python3-django111 - horizon-selenium-headless - horizon-dsvm-tempest-plugin - openstack-tox-lower-constraints diff --git a/tox.ini b/tox.ini index f1dd4f6354..4358e9b42f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pep8,py27,py35,py35dj20,releasenotes,npm +envlist = pep8,py27,py35,py3-dj111,releasenotes,npm minversion = 2.3.2 skipsdist = True @@ -32,12 +32,10 @@ setenv = {[testenv]setenv} commands = {[unit_tests]commands} -[testenv:py35dj20] -basepython = python3.5 -deps = - -r{toxinidir}/test-requirements.txt +[testenv:py3-dj111] +basepython = python3 commands = - pip install django>=2.0,<2.1 + pip install django>=1.11,<2 {[unit_tests]commands} [unit_tests]