diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2016-12-21 13:19:04 +1100 |
---|---|---|
committer | Tony Breeds <tony@bakeyournoodle.com> | 2016-12-23 14:06:29 +1100 |
commit | 42f6bdc44a7023fe7a9c795e7eb61859de61f360 (patch) | |
tree | 779ca23376a2e6d9d60990850c9335eee1c13a03 | |
parent | 9ad355705e4d9deb89cd6f399c71761b3ce1149d (diff) | |
download | python-saharaclient-42f6bdc44a7023fe7a9c795e7eb61859de61f360.tar.gz |
Add Constraints supportmitaka-eolstable/mitaka
Adding constraints support to libraries is slightly more complex than
services as the libraries themselves are listed in upper-constraints.txt
which leads to errors that you can't install a specific version and a
constrained version.
This change adds constraints support by also adding a helper script to
edit the constraints to remove python-saharaclient.
Change-Id: Ie448db6f78865a3dddadf7dc659c7546a5e0fa72
(cherry picked from commit fb803225f3e7c48958acc86a9e9b747d598320ee)
-rwxr-xr-x | tools/tox_install.sh | 30 | ||||
-rw-r--r-- | tox.ini | 6 |
2 files changed, 34 insertions, 2 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh new file mode 100755 index 0000000..e61b63a --- /dev/null +++ b/tools/tox_install.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Client constraint file contains this client version pin that is in conflict +# with installing the client from source. We should remove the version pin in +# the constraints file before applying it for from-source installation. + +CONSTRAINTS_FILE="$1" +shift 1 + +set -e + +# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get +# published to logs.openstack.org for easy debugging. +localfile="$VIRTUAL_ENV/log/upper-constraints.txt" + +if [[ "$CONSTRAINTS_FILE" != http* ]]; then + CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE" +fi +# 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 + +# This is the main purpose of the script: Allow local installation of +# the current repo. It is listed in constraints file and thus any +# install will be constrained and we need to unconstrain it. +edit-constraints "$localfile" -- "$CLIENT_NAME" + +pip install -c"$localfile" -U "$@" +exit $? @@ -1,13 +1,15 @@ [tox] envlist = py27,py34,pypy,pep8,releasenotes -minversion = 1.6 +minversion = 2.0 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/mitaka} {opts} {packages} setenv = VIRTUAL_ENV={envdir} + BRANCH_NAME=stable/mitaka + CLIENT_NAME=python-saharaclient DISCOVER_DIRECTORY=saharaclient/tests/unit deps = -r{toxinidir}/requirements.txt |