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: I61129acf42b1c39c212c91ae0db06342472808b6
This commit is contained in:
Akihiro Motoki 2018-06-13 19:29:16 +09:00
parent c29ddbbeed
commit c6d1225686
2 changed files with 5 additions and 9 deletions

View File

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

View File

@ -72,8 +72,8 @@ deps =
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
[testenv:py35dj20]
basepython = python3.5
[testenv:py3-dj111]
basepython = python3
commands =
pip install django>=2.0,<2.1
pip install django>=1.11,<2
{[testenv]commands}