diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-23 12:50:17 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-23 12:50:17 +0000 |
commit | 7bc31f9aa01a19ffb5cc5f00ff4c57d4a4ebc8fe (patch) | |
tree | 3f25bedbe38dd502fe6897a8ea9903ac0f5628ac | |
parent | c23cd7df2dd2ad7bd48f4dc0b653a675dc4ff7be (diff) | |
parent | 02d86aff5d46706ba07dd19505af55cc91e0455f (diff) | |
download | python-neutronclient-7bc31f9aa01a19ffb5cc5f00ff4c57d4a4ebc8fe.tar.gz |
Merge "Constraint tox targets with upper-constraints.txt" into stable/liberty
-rwxr-xr-x | tools/tox_install.sh | 55 | ||||
-rw-r--r-- | tox.ini | 7 |
2 files changed, 61 insertions, 1 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh new file mode 100755 index 0000000..e07c7f6 --- /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-neutronclient +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 $? @@ -10,7 +10,8 @@ setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US:en LC_ALL=C 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} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt # Delete bytecodes from normal directories before running tests. @@ -27,6 +28,8 @@ commands = flake8 distribute = false [testenv:venv] +# TODO(ihrachys): remove once infra supports constraints for this target +install_command = pip install -U {opts} {packages} commands = {posargs} [testenv:functional] @@ -34,6 +37,8 @@ setenv = OS_TEST_PATH = ./neutronclient/tests/functional [testenv:cover] +# TODO(ihrachys): remove once infra supports constraints for this target +install_command = pip install -U {opts} {packages} commands = python setup.py testr --coverage --testr-args='{posargs}' [testenv:docs] |