Add python3 django 1.11 job instead of django 2.0 job

Django 2.0 is now used in tox py35 job, so there is no need for
py35dj20 job. Instead, Django 1.11 with python3 is not covered.

- py35dj20 job is dropped from tox.ini.
- python3-django111 is added to tox.ini.
  python3 is specified to basepython to avoid a specific python version.
- .zuul.yaml is updated to consume horizon-openstack-tox-python3-django111
  and drop horizon-openstack-tox-py35dj20.

Change-Id: I3f7b2d3398aa482b21a7d10fb98121161d6567bf
This commit is contained in:
Akihiro Motoki 2018-06-13 00:16:31 +09:00
parent 513af9dbc3
commit dba0490b24
2 changed files with 9 additions and 10 deletions

View File

@ -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

14
tox.ini
View File

@ -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]