openstack/python-swiftclient
Code Issues Proposed changes

Merge "Update tox_install.sh to align for sphinx jobs"

Browse Source
This commit is contained in:
Zuul
2017-11-28 13:05:48 +00:00
committed by Gerrit Code Review
parent f48f421a86 ae2dfaec36
commit 2b3a659da4
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/tox_install.sh
View File

@@ -4,28 +4,27 @@
# with installing the client from source. We should remove the version pin in # with installing the client from source. We should remove the version pin in
# the constraints file before applying it for from-source installation. # the constraints file before applying it for from-source installation.
CONSTRAINTS_FILE=$1
shift 1
set -e set -e
if [[ -z "$CONSTRAINTS_FILE" ]]; then
echo 'WARNING: expected $CONSTRAINTS_FILE to be set' >&2
PIP_FLAGS=(-U)
else
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get # NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
# published to logs.openstack.org for easy debugging. # published to logs.openstack.org for easy debugging.
localfile="$VIRTUAL_ENV/log/upper-constraints.txt" localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
if [[ "$CONSTRAINTS_FILE" != http* ]]; then if [[ $CONSTRAINTS_FILE != http* ]]; then
CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE" CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
fi fi
curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile" # NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
pip install -c"$localfile" openstack-requirements pip install -c$localfile openstack-requirements
# This is the main purpose of the script: Allow local installation of # This is the main purpose of the script: Allow local installation of
# the current repo. It is listed in constraints file and thus any # the current repo. It is listed in constraints file and thus any
# install will be constrained and we need to unconstrain it. # install will be constrained and we need to unconstrain it.
edit-constraints "$localfile" -- "$CLIENT_NAME" edit-constraints $localfile -- $CLIENT_NAME
PIP_FLAGS=(-c"$localfile" -U)
fi
pip install "${PIP_FLAGS[@]}" "$@" pip install -c$localfile -U $*
exit $?

3
tox.ini
View File

@@ -5,13 +5,12 @@ skipsdist = True
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = {toxinidir}/tools/tox_install.sh {opts} {packages} install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
setenv = setenv =
LANG=en_US.utf8 LANG=en_US.utf8
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
BRANCH_NAME=master BRANCH_NAME=master
CLIENT_NAME=python-swiftclient CLIENT_NAME=python-swiftclient
CONSTRAINTS_FILE={env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt