diff options
author | Andreas Jaeger <aj@suse.com> | 2017-12-01 09:51:13 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.com> | 2017-12-01 09:51:13 +0100 |
commit | 093bae22476e52ec3a387c5154da8943b852542f (patch) | |
tree | 63a6b32e012c433f33dbbcac6f1ee450442a621e | |
parent | 0ff2675f7e576431f8ddea0f16d77c1c9279f680 (diff) | |
download | oslo-rootwrap-093bae22476e52ec3a387c5154da8943b852542f.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: I79cc8160e11d11de83d91323ec28ccbe1b5fc15f
-rwxr-xr-x | tools/tox_install.sh | 30 | ||||
-rw-r--r-- | tox.ini | 11 |
2 files changed, 5 insertions, 36 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 43468e4..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,12 +3,11 @@ minversion = 2.0 envlist = py35,py27,pep8 [testenv] -setenv = - VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=oslo.rootwrap -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 +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 # Functional tests with Eventlet involve monkeypatching, so force them to be # run in a separate process whitelist_externals = env |