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: I1d990e8c9ab2d979a5e462361cf7a8e3d461138c
This commit is contained in:
Akihiro Motoki 2018-06-08 18:09:39 +09:00
parent c52b6d02ef
commit bf02144549
2 changed files with 6 additions and 9 deletions

View File

@ -4,14 +4,10 @@
- openstack-tox-lower-constraints:
required-projects:
- openstack/horizon
- horizon-openstack-tox-py35dj20:
required-projects:
- openstack/horizon
- horizon-openstack-tox-python3-django111
gate:
jobs:
- openstack-tox-lower-constraints:
required-projects:
- openstack/horizon
- horizon-openstack-tox-py35dj20:
required-projects:
- openstack/horizon
- horizon-openstack-tox-python3-django111

View File

@ -35,11 +35,12 @@ commands =
coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
[testenv:py35dj20]
basepython = python3.5
[testenv:py3-dj111]
basepython = python3
commands =
pip install django>=2.0,<2.1
pip install django>=1.11,<2
{[unit_tests]commands}
pip freeze
[testenv:docs]
deps =