diff --git a/.zuul.yaml b/.zuul.yaml index 58d8a828..bc792483 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,12 +2,8 @@ check: jobs: - openstack-tox-lower-constraints - - horizon-openstack-tox-py35dj20: - required-projects: - openstack/horizon + - horizon-openstack-tox-python3-django111 gate: jobs: - openstack-tox-lower-constraints - - horizon-openstack-tox-py35dj20: - required-projects: - openstack/horizon + - horizon-openstack-tox-python3-django111 diff --git a/tox.ini b/tox.ini index 48589bff..62f455a4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27dj18,py27dj19,py27dj110,py27dj111,py35dj18,py35dj19,py35dj110,py35dj111,pep8,releasenotes +envlist = py27,py35,py3-dj111,pep8,releasenotes minversion = 2.3.2 skipsdist = True @@ -36,62 +36,14 @@ commands = coverage xml coverage html -[testenv:py27dj18] -basepython = python2.7 -commands = - pip install django>=1.8,<1.9 - {[unit_tests]commands} - -[testenv:py27dj19] -basepython = python2.7 -commands = - pip install django>=1.9,<1.10 - {[unit_tests]commands} - -[testenv:py27dj110] -basepython = python2.7 -commands = - pip install django>=1.10,<1.11 - {[unit_tests]commands} - -[testenv:py27dj111] -basepython = python2.7 -commands = - pip install django>=1.11,<2.0 - {[unit_tests]commands} - [testenv:py35] basepython = python3.5 commands = {[unit_tests]commands} -[testenv:py35dj18] -basepython = python3.5 +[testenv:py3-dj111] +basepython = python3 commands = - pip install django>=1.8,<1.9 - {[unit_tests]commands} - -[testenv:py35dj19] -basepython = python3.5 -commands = - pip install django>=1.9,<1.10 - {[unit_tests]commands} - -[testenv:py35dj110] -basepython = python3.5 -commands = - pip install django>=1.10,<1.11 - {[unit_tests]commands} - -[testenv:py35dj111] -basepython = python3.5 -commands = - pip install django>=1.11,<2.0 - {[unit_tests]commands} - -[testenv:py35dj20] -basepython = python3.5 -commands = - pip install django>=2.0,<2.1 + pip install django>=1.11,<2 {[unit_tests]commands} [testenv:docs]