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: I5fd37cfcf5e96c97f92f89687cced58bf2ef4fed
This commit is contained in:
Akihiro Motoki 2018-06-21 23:46:09 +09:00
parent 35473d1b1a
commit 57e8d7b9f8
2 changed files with 5 additions and 9 deletions

View File

@ -3,15 +3,11 @@
jobs: jobs:
- murano-dashboard-sanity-check - murano-dashboard-sanity-check
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
- horizon-openstack-tox-py35dj20: - horizon-openstack-tox-python3-django111
required-projects:
openstack/horizon
gate: gate:
jobs: jobs:
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
- horizon-openstack-tox-py35dj20: - horizon-openstack-tox-python3-django111
required-projects:
openstack/horizon
- job: - job:
name: murano-dashboard-sanity-check name: murano-dashboard-sanity-check

View File

@ -71,8 +71,8 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
http://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz http://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz
[testenv:py35dj20] [testenv:py3-dj111]
basepython = python3.5 basepython = python3
commands = commands =
pip install django>=2.0,<2.1 pip install django>=1.11,<2
{[testenv]commands} {[testenv]commands}