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: I8732c7032bd45ce1186f3751f4953348ef4ef1cc
This commit is contained in:
parent
badc30fcf2
commit
b9c0eb78a0
@ -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 $?
|
|
8
tox.ini
8
tox.ini
@ -7,14 +7,16 @@ skipsdist = True
|
|||||||
usedevelop = True
|
usedevelop = True
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_TEST_PATH=monasca_events_api/tests/unit
|
OS_TEST_PATH=monasca_events_api/tests/unit
|
||||||
CLIENT_NAME=monasca-events-api
|
|
||||||
passenv = *_proxy
|
passenv = *_proxy
|
||||||
*_PROXY
|
*_PROXY
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
find
|
find
|
||||||
rm
|
rm
|
||||||
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?master} {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
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
|
||||||
commands =
|
commands =
|
||||||
find ./ -type f -name '*.pyc' -delete
|
find ./ -type f -name '*.pyc' -delete
|
||||||
rm -Rf .testrepository/times.dbm
|
rm -Rf .testrepository/times.dbm
|
||||||
|
Loading…
x
Reference in New Issue
Block a user