openstack
/
heat-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 02:11:29 +00:00 committed by Gerrit Code Review
parent 1dfb76f6ec 850e8741a3
commit a37b49fb4e
2 changed files with 6 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.yaml
View File

@ -2,12 +2,8 @@
check: check:
jobs: jobs:
- 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

56
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py27dj18,py27dj19,py27dj110,py27dj111,py35dj18,py35dj19,py35dj110,py35dj111,pep8,releasenotes envlist = py27,py35,py3-dj111,pep8,releasenotes
minversion = 2.3.2 minversion = 2.3.2
skipsdist = True skipsdist = True
@ -36,62 +36,14 @@ commands =
coverage xml coverage xml
coverage html coverage html
[testenv:py27dj18]
basepython = python2.7
commands =
pip install django>=1.8,<1.9
{[unit_tests]commands}
[testenv:py27dj19]
basepython = python2.7
commands =
pip install django>=1.9,<1.10
{[unit_tests]commands}
[testenv:py27dj110]
basepython = python2.7
commands =
pip install django>=1.10,<1.11
{[unit_tests]commands}
[testenv:py27dj111]
basepython = python2.7
commands =
pip install django>=1.11,<2.0
{[unit_tests]commands}
[testenv:py35] [testenv:py35]
basepython = python3.5 basepython = python3.5
commands = {[unit_tests]commands} commands = {[unit_tests]commands}
[testenv:py35dj18] [testenv:py3-dj111]
basepython = python3.5 basepython = python3
commands = commands =
pip install django>=1.8,<1.9 pip install django>=1.11,<2
{[unit_tests]commands}
[testenv:py35dj19]
basepython = python3.5
commands =
pip install django>=1.9,<1.10
{[unit_tests]commands}
[testenv:py35dj110]
basepython = python3.5
commands =
pip install django>=1.10,<1.11
{[unit_tests]commands}
[testenv:py35dj111]
basepython = python3.5
commands =
pip install django>=1.11,<2.0
{[unit_tests]commands}
[testenv:py35dj20]
basepython = python3.5
commands =
pip install django>=2.0,<2.1
{[unit_tests]commands} {[unit_tests]commands}
[testenv:docs] [testenv:docs]