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 oslo.messaging. Change-Id: I8be883215f27abb58d15b85e8542cbdf32000bac
This commit is contained in:
parent
1346a5e830
commit
78f1137805
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 $?
|
26
tox.ini
26
tox.ini
@ -1,11 +1,17 @@
|
|||||||
[tox]
|
[tox]
|
||||||
|
minversion = 2.0
|
||||||
envlist = py35,py34,py27,pep8,bandit
|
envlist = py35,py34,py27,pep8,bandit
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
OS_TEST_TIMEOUT=30
|
OS_TEST_TIMEOUT=30
|
||||||
|
BRANCH_NAME=master
|
||||||
|
CLIENT_NAME=oslo.messaging
|
||||||
passenv = OS_*
|
passenv = OS_*
|
||||||
|
ZUUL_CACHE_DIR
|
||||||
|
REQUIREMENTS_PIP_LOCATION
|
||||||
|
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
||||||
|
|
||||||
@ -14,7 +20,6 @@ commands = flake8
|
|||||||
deps = hacking<0.11,>=0.10.0
|
deps = hacking<0.11,>=0.10.0
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
|
||||||
commands =
|
commands =
|
||||||
python setup.py test --coverage --coverage-package-name=oslo_messaging --testr-args='{posargs}'
|
python setup.py test --coverage --coverage-package-name=oslo_messaging --testr-args='{posargs}'
|
||||||
|
|
||||||
@ -25,25 +30,34 @@ commands = {posargs}
|
|||||||
commands = python setup.py build_sphinx
|
commands = python setup.py build_sphinx
|
||||||
|
|
||||||
[testenv:py27-func-rabbit]
|
[testenv:py27-func-rabbit]
|
||||||
setenv = TRANSPORT_DRIVER=rabbit
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
TRANSPORT_DRIVER=rabbit
|
||||||
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
||||||
|
|
||||||
[testenv:py34-func-rabbit]
|
[testenv:py34-func-rabbit]
|
||||||
setenv = TRANSPORT_DRIVER=rabbit
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
TRANSPORT_DRIVER=rabbit
|
||||||
basepython = python3.4
|
basepython = python3.4
|
||||||
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
||||||
|
|
||||||
[testenv:py35-func-rabbit]
|
[testenv:py35-func-rabbit]
|
||||||
setenv = TRANSPORT_DRIVER=rabbit
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
TRANSPORT_DRIVER=rabbit
|
||||||
basepython = python3.5
|
basepython = python3.5
|
||||||
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
||||||
|
|
||||||
[testenv:py27-func-pika]
|
[testenv:py27-func-pika]
|
||||||
setenv = TRANSPORT_DRIVER=pika
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
TRANSPORT_DRIVER=pika
|
||||||
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
|
||||||
|
|
||||||
[testenv:py27-func-amqp1]
|
[testenv:py27-func-amqp1]
|
||||||
setenv =
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
|
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
|
||||||
AMQP1_BACKEND=qpidd
|
AMQP1_BACKEND=qpidd
|
||||||
ENVNAME={envname}
|
ENVNAME={envname}
|
||||||
@ -54,6 +68,7 @@ commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest -
|
|||||||
[testenv:py34-func-amqp1]
|
[testenv:py34-func-amqp1]
|
||||||
basepython = python3.4
|
basepython = python3.4
|
||||||
setenv =
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
|
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
|
||||||
AMQP1_BACKEND=qpidd
|
AMQP1_BACKEND=qpidd
|
||||||
ENVNAME={envname}
|
ENVNAME={envname}
|
||||||
@ -64,6 +79,7 @@ commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest -
|
|||||||
[testenv:py35-func-amqp1]
|
[testenv:py35-func-amqp1]
|
||||||
basepython = python3.5
|
basepython = python3.5
|
||||||
setenv =
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
|
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
|
||||||
AMQP1_BACKEND=qpidd
|
AMQP1_BACKEND=qpidd
|
||||||
ENVNAME={envname}
|
ENVNAME={envname}
|
||||||
|
Loading…
Reference in New Issue
Block a user