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

This commit is contained in:
Zuul 2018-06-14 02:43:35 +00:00 committed by Gerrit Code Review
commit df7e11ff37
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]