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
This commit is contained in:
parent
fc115e4605
commit
64719c6eea
30
tools/tox_install.sh
Executable file
30
tools/tox_install.sh
Executable file
@ -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 $?
|
11
tox.ini
11
tox.ini
@ -1,10 +1,13 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py35,py34,py27,pep8,docs
|
envlist = py35,py34,py27,pep8,docs
|
||||||
minversion = 1.6
|
minversion = 2.0
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[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}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
|
BRANCH_NAME=master
|
||||||
|
CLIENT_NAME=vmware-nsxlib
|
||||||
PYTHONWARNINGS=default::DeprecationWarning
|
PYTHONWARNINGS=default::DeprecationWarning
|
||||||
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
@ -18,7 +21,8 @@ commands =
|
|||||||
|
|
||||||
[testenv:common]
|
[testenv:common]
|
||||||
# Fake job to define environment variables shared between dsvm/non-dsvm jobs
|
# 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
|
commands = false
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
@ -33,7 +37,8 @@ deps =
|
|||||||
|
|
||||||
[testenv:dsvm-functional]
|
[testenv:dsvm-functional]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
setenv = OS_SUDO_TESTING=1
|
setenv = {[testenv]setenv}
|
||||||
|
OS_SUDO_TESTING=1
|
||||||
OS_FAIL_ON_MISSING_DEPS=1
|
OS_FAIL_ON_MISSING_DEPS=1
|
||||||
OS_TEST_TIMEOUT=180
|
OS_TEST_TIMEOUT=180
|
||||||
sitepackages=True
|
sitepackages=True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user