From 693f946d2392e1ebdf810424e760c888512fc5e2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 9 Dec 2016 12:10:01 +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 os-refresh-config. Change-Id: Ia7d3b98fcfa5245e8cf51951e4c2af7ac3541014 --- tools/tox_install.sh | 30 ++++++++++++++++++++++++++++++ tox.ini | 10 ++++++---- 2 files changed, 36 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 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 f74fc27..4479957 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,17 @@ [tox] -minversion = 1.6 +minversion = 2.0 skipsdist = True envlist = py27,pep8 [testenv] usedevelop = True -install_command = pip install -U {opts} {packages} -setenv = VIRTUAL_ENV={envdir} +setenv = + VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=os-refresh-config deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} commands = python setup.py testr --slowest --testr-args='{posargs}' @@ -19,7 +22,6 @@ sitepackages = True commands = flake8 [testenv:cover] -setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --coverage --coverage-package-name=os_refresh_config