From 6ec390481821b06313757be0e37396e179f2769a Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 21 Dec 2016 14:09:18 +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 python-karborclient. Change-Id: Ib7f5194b7cf04917d8cfd3e7e1dafc303e234d20 --- tools/tox_install.sh | 30 ++++++++++++++++++++++++++++++ tox.ini | 7 +++++-- 2 files changed, 35 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..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 $? diff --git a/tox.ini b/tox.ini index c4ab8b1..84389e5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,15 @@ [tox] -minversion = 1.6 +minversion = 2.0 envlist = py35,py34,py27,pypy,pep8 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} {opts} {packages} setenv = VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=python-karborclient deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py test --slowest --testr-args='{posargs}' @@ -20,6 +22,7 @@ commands = {posargs} [testenv:functional] setenv = + {[testenv]setenv} OS_TEST_PATH = ./karborclient/tests/functional passenv = OS_* [testenv:cover]