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: Ib6f271d9cc8446875d6284a1f7d9f17aab90c47c
This commit is contained in:
Akihiro Motoki 2018-06-13 19:30:57 +09:00
parent 7c4d4199e0
commit 9190e35dc6
2 changed files with 10 additions and 14 deletions

View File

@ -1,17 +1,13 @@
- project:
check:
jobs:
- horizon-openstack-tox-py35dj20:
required-projects:
openstack/horizon
- horizon-openstack-tox-python3-django111
- openstack-tox-lower-constraints:
required-projects:
openstack/horizon
gate:
jobs:
- horizon-openstack-tox-py35dj20:
required-projects:
openstack/horizon
- horizon-openstack-tox-python3-django111
- openstack-tox-lower-constraints:
required-projects:
openstack/horizon

16
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
@ -60,17 +60,17 @@ commands =
{[testenv:hz-local]commands}
{[testenv]commands}
[testenv:py35dj20]
basepython = python3.5
[testenv:py3-dj111]
basepython = python3
commands =
{[testenv:hz-local]commands}
{[testenv]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]