From 9e9631369082485823259e5cd14f99701cca6f26 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Tue, 13 Dec 2016 15:14:37 +1100 Subject: [PATCH] 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.rootwrap. Change-Id: Ie14167eced0bba29f7d4e30f815785641c1da6c0 --- tools/tox_install.sh | 30 ++++++++++++++++++++++++++++++ tox.ini | 8 ++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100755 tools/tox_install.sh diff --git a/tools/tox_install.sh b/tools/tox_install.sh new file mode 100755 index 0000000..43468e4 --- /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 $? diff --git a/tox.ini b/tox.ini index bfc95ce..b4c41c1 100644 --- a/tox.ini +++ b/tox.ini @@ -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.rootwrap +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 # Functional tests with Eventlet involve monkeypatching, so force them to be # run in a separate process @@ -17,7 +22,6 @@ commands = flake8 [testenv:cover] deps = {[testenv]deps} coverage -setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --coverage