From 64719c6eea3ad38a4917561992d3424ff0d7838f Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 21 Dec 2016 13:54:41 +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 vmware-nsxlib. Change-Id: Ibbb6da2551bf7eb840fb4b1d11e090dbe4db7c52 --- tools/tox_install.sh | 30 ++++++++++++++++++++++++++++++ tox.ini | 11 ++++++++--- 2 files changed, 38 insertions(+), 3 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 1944bd2d..f30202a0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,13 @@ [tox] envlist = py35,py34,py27,pep8,docs -minversion = 1.6 +minversion = 2.0 skipsdist = True [testenv] +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=vmware-nsxlib PYTHONWARNINGS=default::DeprecationWarning passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY usedevelop = True @@ -18,7 +21,8 @@ commands = [testenv:common] # Fake job to define environment variables shared between dsvm/non-dsvm jobs -setenv = OS_TEST_TIMEOUT=180 +setenv = {[testenv]setenv} + OS_TEST_TIMEOUT=180 commands = false [testenv:functional] @@ -33,7 +37,8 @@ deps = [testenv:dsvm-functional] basepython = python2.7 -setenv = OS_SUDO_TESTING=1 +setenv = {[testenv]setenv} + OS_SUDO_TESTING=1 OS_FAIL_ON_MISSING_DEPS=1 OS_TEST_TIMEOUT=180 sitepackages=True