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: I50713dab7f944cbb9cbead3f00c95be7bb9c623e
This commit is contained in:
parent
0f2a2a20ed
commit
e3e9135fba
@ -6,17 +6,13 @@
|
|||||||
- openstack-tox-lower-constraints:
|
- openstack-tox-lower-constraints:
|
||||||
required-projects:
|
required-projects:
|
||||||
openstack/horizon
|
openstack/horizon
|
||||||
- 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:
|
||||||
required-projects:
|
required-projects:
|
||||||
openstack/horizon
|
openstack/horizon
|
||||||
- horizon-openstack-tox-py35dj20:
|
- horizon-openstack-tox-python3-django111
|
||||||
required-projects:
|
|
||||||
openstack/horizon
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: manila-ui-dsvm
|
name: manila-ui-dsvm
|
||||||
|
11
tox.ini
11
tox.ini
@ -1,6 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 1.6
|
minversion = 1.6
|
||||||
envlist = py27,py35,pep8,py27dj19,py27dj110,py35dj20
|
envlist = py27,py35,pep8,py27dj19,py27dj110,py3-dj111
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
@ -40,10 +40,11 @@ basepython = python2.7
|
|||||||
commands = pip install django>=1.10,<1.11
|
commands = pip install django>=1.10,<1.11
|
||||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||||
|
|
||||||
[testenv:py35dj20]
|
[testenv:py3-dj111]
|
||||||
basepython = python3.5
|
basepython = python3
|
||||||
commands = pip install django>=2.0,<2.1
|
commands =
|
||||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
pip install django>=1.11,<2
|
||||||
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
commands = {toxinidir}/tools/cover.sh {posargs}
|
commands = {toxinidir}/tools/cover.sh {posargs}
|
||||||
|
Loading…
Reference in New Issue
Block a user