diff --git a/.zuul.yaml b/.zuul.yaml index 702ee55..a79bb23 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,9 +11,7 @@ node_version: 4 required-projects: openstack/horizon - - horizon-openstack-tox-py35dj20: - required-projects: - openstack/horizon + - horizon-openstack-tox-python3-django111 - openstack-tox-lower-constraints: required-projects: openstack/horizon @@ -29,6 +27,7 @@ node_version: 4 required-projects: openstack/horizon + - horizon-openstack-tox-python3-django111 - openstack-tox-lower-constraints: required-projects: openstack/horizon diff --git a/tox.ini b/tox.ini index 7d78b65..1177a39 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pep8,py27-local,py35-local,py35dj20-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local +envlist = pep8,py27-local,py35-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local minversion = 2.3.2 skipsdist = True @@ -57,17 +57,17 @@ commands = {[testenv:hz-local]commands} {[testenv]commands} -[testenv:py35dj20] -basepython = python3.5 +[testenv:py3-dj111] +basepython = python3 commands = - {[testenv:hz-local]commands} + pip install django>=1.11,<2 {[testenv]commands} -[testenv:py35dj20-local] -basepython = python3.5 +[testenv:py3-dj111-local] +basepython = python3 commands = {[testenv:hz-local]commands} - pip install -U django>=2.0,<2.1 + pip install django>=1.11,<2 {[testenv]commands} [testenv:eslint]