openstack
/
python-monascaclient
Code Issues Proposed changes

Merge "Use stable/newton branch in tox_install.sh and tox.ini" into stable/newton

This commit is contained in:
Jenkins 2017-07-17 05:29:55 +00:00 committed by Gerrit Code Review
parent fdd99d2fd4 b6f45ab952
commit cb93343447
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/tox_install.sh
View File

@ -5,7 +5,7 @@
# the constraints file before applying it for from-source installation.
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
BRANCH_NAME=master
BRANCH_NAME=stable/newton
CLIENT_NAME=python-monascaclient
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)

2
tox.ini
View File

@ -7,7 +7,7 @@ skipsdist = True
setenv = VIRTUAL_ENV={envdir}
usedevelop = True
install_command =
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/newton} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = find