summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihrachys@redhat.com>2016-05-18 10:44:16 +0200
committerIhar Hrachyshka <ihrachys@redhat.com>2016-05-23 11:58:51 +0200
commit02d86aff5d46706ba07dd19505af55cc91e0455f (patch)
tree464e45f2bef557b8d11eefde4e6e71027ddaa308
parent1575d92ba5be356e34df34513675299198074c95 (diff)
downloadpython-neutronclient-02d86aff5d46706ba07dd19505af55cc91e0455f.tar.gz
Constraint tox targets with upper-constraints.txt
Client version pin is maintained in upper-constraints.txt file, so we should replace it in the file with source based specifier before applying it to pip install, otherwise pip fails with: Could not satisfy constraints for 'python-neutronclient': installation from path or url cannot be constrained to a version Conflicts: tox.ini Liberty changes: - no change for releasenotes tox target due to it's missing in the branch. Also switched to using stable/liberty branch instead of master. Change-Id: I33302cdcab980a42c39dc9ec1e430add459615ff Closes-Bug: #1583050 (cherry picked from commit 78d778cdeccb6a24b7f6fa7e3c2eb0891b633701)
-rwxr-xr-xtools/tox_install.sh55
-rw-r--r--tox.ini7
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 $?
diff --git a/tox.ini b/tox.ini
index 7f705d1..7af1d81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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
commands = python setup.py testr --testr-args='{posargs}'
@@ -20,6 +21,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]
@@ -27,6 +30,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]