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
This commit is contained in:
parent
0ff2675f7e
commit
093bae2247
|
@ -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
tox.ini
11
tox.ini
|
@ -3,12 +3,11 @@ minversion = 2.0
|
||||||
envlist = py35,py27,pep8
|
envlist = py35,py27,pep8
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv =
|
install_command = pip install -U {opts} {packages}
|
||||||
VIRTUAL_ENV={envdir}
|
deps =
|
||||||
BRANCH_NAME=master
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
CLIENT_NAME=oslo.rootwrap
|
-r{toxinidir}/test-requirements.txt
|
||||||
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
-r{toxinidir}/requirements.txt
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
# Functional tests with Eventlet involve monkeypatching, so force them to be
|
# Functional tests with Eventlet involve monkeypatching, so force them to be
|
||||||
# run in a separate process
|
# run in a separate process
|
||||||
whitelist_externals = env
|
whitelist_externals = env
|
||||||
|
|
Loading…
Reference in New Issue