openstack/deb-python-openstackclient
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2016-12-09 17:53:17 +00:00
committed by Gerrit Code Review
parent a37addb7b0 d08bdd1e23
commit f1c082dd9b
2 changed files with 2 additions and 2 deletions
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-openstackclient
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)

2
tox.ini
View File

@@ -6,7 +6,7 @@ skipdist = True
[testenv]
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}
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt
commands = ostestr {posargs}