openstack
/
python-openstackclient
Code Issues Proposed changes

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

This change modifies tox_install.sh wrapper to pick dependencies
for the correct branch for stable/newton release.

Adjust upper-constraints.txt in tox.ini to pick dependencies
from stable/newton branch.

Change-Id: Ic63c363bf12e2f31b18271ef8bf26cbe5f5ca212
This commit is contained in:
Michal Pryc 2016-11-24 10:13:26 +01:00
parent 67dfccbd47
commit d08bdd1e23
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-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}