diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2016-12-13 15:08:49 +1100 |
---|---|---|
committer | Jeremy Stanley <fungi@yuggoth.org> | 2017-01-26 18:15:04 +0000 |
commit | 5b6a04b48354f50baa58112a06e1ede84f00df1a (patch) | |
tree | 6b9666ce45980977328a49cf293aacedc4a71cf7 | |
parent | e3e052a92e9eb3e40af3c653281c944d34f822b4 (diff) | |
download | oslo-middleware-5b6a04b48354f50baa58112a06e1ede84f00df1a.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.middleware.
Change-Id: I069e64daf9558147fdab947341411b58770d3506
(cherry picked from commit fa815cfb2fe4ce4f5d99f2ef1c8780f8589368f6)
-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 = py34,py27,pypy,pep8 [testenv] +setenv = + VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=oslo.middleware +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 commands = python setup.py testr --slowest --testr-args='{posargs}' |