diff options
author | Niall Bunting <niall.bunting@hpe.com> | 2016-06-02 16:32:28 +0000 |
---|---|---|
committer | Tony Breeds <tony@bakeyournoodle.com> | 2016-06-21 11:26:11 +1000 |
commit | 8e2063272a640b7d72b597f543893ca8e563a39a (patch) | |
tree | 098be8e9b3bf497f9361f0cd4a848e3c9964ddc2 | |
parent | 8af249fcc9c5d1fe92f010eb19c6276cb5167bf6 (diff) | |
download | python-glanceclient-8e2063272a640b7d72b597f543893ca8e563a39a.tar.gz |
Add upper constraints to glanceclient
This will force pip install to use the upper-constraints.txt specified
version of pip modules. When you don't do this, you are out on the
bleeding edge and become unstable everytime some python library in the
world changes in a way that you don't expect.
The script is needed because it cleans up the conflicting entry that
corresponds to the client before applying it to source based
installation.
NOTE(tonyb): Use the stable/liberty branch fof the upper-constraints.txt
file
Change-Id: I8f168fde04bf9e421d9a39e91a041512bf4f2b79
Closes-Bug: 1563038
cherry-picked from commit 8585bd60325e7d9b08aa6043afc00fb83d2b2356
-rwxr-xr-x | tools/tox_install.sh | 55 | ||||
-rw-r--r-- | tox.ini | 13 |
2 files changed, 67 insertions, 1 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh new file mode 100755 index 0000000..74ecec5 --- /dev/null +++ b/tools/tox_install.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +# Client constraint file contains this client version pin that is in conflict +# with installing the client from source. We should replace the version pin in +# the constraints file before applying it for from-source installation. + +ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner +BRANCH_NAME=stable/liberty +CLIENT_NAME=python-glanceclient +requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) + +set -e + +CONSTRAINTS_FILE=$1 +shift + +install_cmd="pip install" +if [ $CONSTRAINTS_FILE != "unconstrained" ]; then + + mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX") + localfile=$mydir/upper-constraints.txt + if [[ $CONSTRAINTS_FILE != http* ]]; then + CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE + fi + curl $CONSTRAINTS_FILE -k -o $localfile + install_cmd="$install_cmd -c$localfile" + + if [ $requirements_installed -eq 0 ]; then + echo "ALREADY INSTALLED" > /tmp/tox_install.txt + echo "Requirements already installed; using existing package" + elif [ -x "$ZUUL_CLONER" ]; then + export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH} + echo "ZUUL CLONER" > /tmp/tox_install.txt + pushd $mydir + $ZUUL_CLONER --cache-dir \ + /opt/git \ + --branch $BRANCH_NAME \ + git://git.openstack.org \ + openstack/requirements + cd openstack/requirements + $install_cmd -e . + popd + else + echo "PIP HARDCODE" > /tmp/tox_install.txt + if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then + REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements" + fi + $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION} + fi + + edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME" +fi + +$install_cmd -U $* +exit $? @@ -5,7 +5,8 @@ skipsdist = True [testenv] usedevelop = True -install_command = pip install -U {opts} {packages} +install_command = + {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/liberty} {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_NOCAPTURE=False OS_STDERR_NOCAPTURE=False @@ -19,6 +20,9 @@ commands = python setup.py testr --testr-args='{posargs}' commands = flake8 [testenv:venv] +# NOTE(NiallBunting) Infra does not support constraints for the venv +# job. +install_command = pip install -U {opts} {packages} commands = {posargs} [testenv:functional] @@ -26,9 +30,16 @@ setenv = OS_TEST_PATH = ./glanceclient/tests/functional [testenv:cover] +# NOTE(NiallBunting) Infra does not support constraints for the cover +# job. While the file is set no file is there. Can be removed once infra +# changes this. +install_command = pip install -U {opts} {packages} commands = python setup.py testr --coverage --testr-args='{posargs}' [testenv:docs] +# NOTE(NiallBunting) This is a post job. So upper constraints will not +# apply here. +install_command = pip install -U {opts} {packages} commands= python setup.py build_sphinx |