openstack
/
senlin-dashboard
Code Issues Proposed changes

Merge "Add python3 django 1.11 job instead of django 2.0 job"

This commit is contained in:
Zuul 2018-06-14 09:30:58 +00:00 committed by Gerrit Code Review
parent 1d1b0f0981 2499301dd6
commit 321d756db5
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.yaml
View File

@ -14,9 +14,7 @@
- openstack-tox-lower-constraints:
required-projects:
openstack/horizon
- horizon-openstack-tox-py35dj20:
required-projects:
openstack/horizon
- horizon-openstack-tox-python3-django111
gate:
jobs:
- nodejs-npm-run-lint:
@ -32,6 +30,4 @@
- openstack-tox-lower-constraints:
required-projects:
openstack/horizon
- horizon-openstack-tox-py35dj20:
required-projects:
openstack/horizon
- horizon-openstack-tox-python3-django111

14
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = pep8,py27-local,py35-local,py35dj20-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
envlist = pep8,py27-local,py35-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
minversion = 2.3.2
skipsdist = True
@ -50,17 +50,17 @@ commands =
{[testenv:hz-local]commands}
{[testenv]commands}
[testenv:py35dj20]
basepython = python3.5
[testenv:py3-dj111]
basepython = python3
commands =
{[testenv:hz-local]commands}
pip install django>=1.11,<2
{[testenv]commands}
[testenv:py35dj20-local]
basepython = python3.5
[testenv:py3-dj111-local]
basepython = python3
commands =
{[testenv:hz-local]commands}
pip install -U django>=2.0,<2.1
pip install django>=1.11,<2
{[testenv]commands}
[testenv:eslint]