diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2016-12-13 14:44:40 +1100 |
---|---|---|
committer | Tony Breeds <tony@bakeyournoodle.com> | 2016-12-20 14:35:31 +1100 |
commit | cda2474b8f0bc723c9e577d44eaa5a419d209787 (patch) | |
tree | d3b1f5cc546bf9f4ca33a8d387371a8f7e6e458f | |
parent | cbd05f4ef5c53e0aac1e53641d927ca4da4fa9c7 (diff) | |
download | oslo-concurrency-cda2474b8f0bc723c9e577d44eaa5a419d209787.tar.gz |
Add Constraints support
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 oslo.concurrency.
Change-Id: Ic887ce8e220df6b87d823490dfb14894935cac61
-rwxr-xr-x | tools/tox_install.sh | 30 | ||||
-rw-r--r-- | tox.ini | 7 |
2 files changed, 36 insertions, 1 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,8 +1,13 @@ [tox] -minversion = 1.6 +minversion = 2.0 envlist = py35,py34,py27,pep8 [testenv] +setenv = + VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=oslo.concurrency +install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/test-requirements.txt # We want to support both vanilla stdlib and eventlet monkey patched commands = |