diff options
| author | Andreas Jaeger <aj@suse.com> | 2017-12-01 07:13:12 +0100 |
|---|---|---|
| committer | Sean McGinnis <sean.mcginnis@huawei.com> | 2017-12-29 12:05:24 -0600 |
| commit | fd1517dbf8bb845fdb416a773c4adafbcd9c00bc (patch) | |
| tree | a34c45f101476eef2da9d9213f9128d398f859fd | |
| parent | 07364d43a8014acd5185375eaf3f61bf533c7add (diff) | |
| download | stevedore-fd1517dbf8bb845fdb416a773c4adafbcd9c00bc.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: Iabc08e643c5978b486d966b824b70ac92b45b4cc
(cherry picked from commit 69ec55d6f82a95d7b4951b19a17e2a31a72c3e7a)
| -rwxr-xr-x | tools/tox_install.sh | 30 | ||||
| -rw-r--r-- | tox.ini | 14 |
2 files changed, 8 insertions, 36 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index e61b63a..0000000 --- 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 $? @@ -3,20 +3,20 @@ minversion = 2.0 envlist = py35,py27,pep8,docs [testenv] -setenv = - VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=stevedore -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} +install_command = pip install -U {opts} {packages} deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt distribute = False commands = python setup.py testr --testr-args='{posargs}' [testenv:venv] deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt + -r{toxinidir}/requirements.txt commands = {posargs} [testenv:pep8] @@ -34,5 +34,7 @@ show-source = True exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build [testenv:releasenotes] -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html |