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: I4bf1a19f46a895f3569d7a79739ac1a7ebf91cbc
This commit is contained in:
Akihiro Motoki 2018-06-13 20:27:36 +09:00
parent d851e2e5cb
commit 45c47fb9c0
2 changed files with 6 additions and 10 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

@ -1,5 +1,5 @@
[tox]
envlist = py35,py27,pep8,py35dj20
envlist = py35,py27,pep8
minversion = 2.3.2
skipsdist = True
@ -35,10 +35,10 @@ 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}
[testenv:docs]