summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Breeds <tony@bakeyournoodle.com>2016-12-21 11:25:36 +1100
committerSteve Martinelli <s.martinelli@gmail.com>2017-01-03 09:13:38 -0500
commitabaf1b5bf718d0c59fa918ada2fb91370292f7c6 (patch)
treee2f1c9768c4f96653a171e516a312abea245cee2
parent2092d5783607223c7cbdfed690997e9c9f831b6f (diff)
downloadkeystonemiddleware-abaf1b5bf718d0c59fa918ada2fb91370292f7c6.tar.gz
Add Constraints support4.13.1
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 keystonemiddleware. Change-Id: Ic181afad5bf3dd89a2edfdf9fb3026f85cdc37a6
-rwxr-xr-xtools/tox_install.sh30
-rw-r--r--tox.ini6
2 files changed, 34 insertions, 2 deletions
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 56111b4..a5bc549 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,14 @@
[tox]
-minversion = 1.6
+minversion = 2.0
skipsdist = True
envlist = py34,py27,pep8,releasenotes
[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=keystonemiddleware
OS_STDOUT_NOCAPTURE=False
OS_STDERR_NOCAPTURE=False