openstack
/
horizon
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-08 10:25:29 +00:00 committed by Gerrit Code Review
parent b1ec09e691 0bc2f1b015
commit e18bda05d0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.zuul.yaml
View File

@ -15,6 +15,14 @@
vars:
tox_envlist: py35dj20
- job:
name: horizon-openstack-tox-python3-django111
parent: horizon-openstack-tox-base
vars:
tox_envlist: py3-dj111
required-projects:
- name: openstack/horizon
- job:
name: horizon-selenium-headless
parent: horizon-openstack-tox-base
@ -54,13 +62,13 @@
- project:
check:
jobs:
- horizon-openstack-tox-py35dj20
- horizon-openstack-tox-python3-django111
- horizon-selenium-headless
- horizon-dsvm-tempest-plugin
- openstack-tox-lower-constraints
gate:
jobs:
- horizon-openstack-tox-py35dj20
- horizon-openstack-tox-python3-django111
- horizon-selenium-headless
- horizon-dsvm-tempest-plugin
- openstack-tox-lower-constraints

10
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = pep8,py27,py35,py35dj20,releasenotes,npm
envlist = pep8,py27,py35,py3-dj111,releasenotes,npm
minversion = 2.3.2
skipsdist = True
@ -33,12 +33,10 @@ setenv =
{[testenv]setenv}
commands = {[unit_tests]commands}
[testenv:py35dj20]
basepython = python3.5
deps =
-r{toxinidir}/test-requirements.txt
[testenv:py3-dj111]
basepython = python3
commands =
pip install django>=2.0,<2.1
pip install django>=1.11,<2
{[unit_tests]commands}
[unit_tests]