diff options
| author | Andreas Jaeger <aj@suse.com> | 2017-12-02 09:33:14 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2018-02-10 15:58:30 +0100 |
| commit | 0d73e34b566274017391e0be4f030f39516ac701 (patch) | |
| tree | a282ae54e38bbafacac3b957d0d3d1adae60aead | |
| parent | ae16e765310e7779b6372d8bce2b7ccfa900ce9b (diff) | |
| download | python-novaclient-0d73e34b566274017391e0be4f030f39516ac701.tar.gz | |
Avoid tox_install.sh for constraints support
We do not need tox_install.sh, pip can handle constraints itself
and install the project correctly. Thus update tox.ini and remove
the now obsolete tools/tox_install.sh file.
This follows https://review.openstack.org/#/c/508061 to remove
tools/tox_install.sh.
Change-Id: I7f06c0be47f57a9c1ee3cadc7328b1b1b138b3cd
(cherry picked from commit aede01a0a8d21d49fc4a811650b5ae5bdcb17adc)
| -rwxr-xr-x | tools/tox_install.sh | 30 | ||||
| -rw-r--r-- | tox.ini | 13 |
2 files changed, 5 insertions, 38 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 43468e45..00000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/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,12 +11,11 @@ whitelist_externals = find bash passenv = 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?h=stable/ocata} {opts} {packages} -setenv = VIRTUAL_ENV={envdir} - BRANCH_NAME=stable/ocata - CLIENT_NAME=python-novaclient - -deps = -r{toxinidir}/test-requirements.txt +install_command = pip install {opts} {packages} +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt commands = find . -type f -name "*.pyc" -delete bash tools/pretty_tox.sh '{posargs}' @@ -44,7 +43,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen basepython = python2.7 passenv = OS_NOVACLIENT_TEST_NETWORK setenv = - {[testenv]setenv} OS_TEST_PATH = ./novaclient/tests/functional commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' @@ -52,7 +50,6 @@ commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' basepython = python3.4 passenv = OS_NOVACLIENT_TEST_NETWORK setenv = - {[testenv]setenv} OS_TEST_PATH = ./novaclient/tests/functional commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' |