From 1070ae649ea17ae76a4f4c75b0503267df5e5e56 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 14 Dec 2016 22:44:15 +0100 Subject: [PATCH] Add Constraints support Adding constraints support to clients is slightly more complex than services as the clients 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 pbr. Change-Id: I80a10f80e2c5efafb099a6c1dcebe8f0935ace09 --- tools/tox_install.sh | 30 ++++++++++++++++++++++++++++++ tox.ini | 9 +++++---- 2 files changed, 35 insertions(+), 4 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 00000000..e61b63a8 --- /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 5126ee9d..65f6aa50 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,15 @@ [tox] -minversion = 1.6 +minversion = 2.0 skipsdist = True envlist = py33,py34,py35,py26,py27,pypy,pep8,docs [testenv] usedevelop = True -install_command = pip install {opts} {packages} +install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE -setenv = VIRTUAL_ENV={envdir} +setenv = + VIRTUAL_ENV={envdir} + CLIENT_NAME=pbr deps = . -r{toxinidir}/test-requirements.txt commands = @@ -23,7 +25,6 @@ commands = flake8 {posargs} commands = python setup.py build_sphinx [testenv:cover] -setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --coverage