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: I1e72cf7084ed0b6fcd3c5df1f31b3fa6c7734d31
This commit is contained in:
parent
7926406568
commit
96f5b3bbfc
@ -1,55 +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 replace the version pin in
|
|
||||||
# the constraints file before applying it for from-source installation.
|
|
||||||
|
|
||||||
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
|
|
||||||
BRANCH_NAME=master
|
|
||||||
CLIENT_NAME=python-neutronclient
|
|
||||||
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
CONSTRAINTS_FILE=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
install_cmd="pip install"
|
|
||||||
mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
|
|
||||||
trap "rm -rf $mydir" EXIT
|
|
||||||
localfile=$mydir/upper-constraints.txt
|
|
||||||
if [[ $CONSTRAINTS_FILE != http* ]]; then
|
|
||||||
CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
|
|
||||||
fi
|
|
||||||
curl $CONSTRAINTS_FILE -k -o $localfile
|
|
||||||
install_cmd="$install_cmd -c$localfile"
|
|
||||||
|
|
||||||
if [ $requirements_installed -eq 0 ]; then
|
|
||||||
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
|
|
||||||
echo "Requirements already installed; using existing package"
|
|
||||||
elif [ -x "$ZUUL_CLONER" ]; then
|
|
||||||
echo "ZUUL CLONER" > /tmp/tox_install.txt
|
|
||||||
pushd $mydir
|
|
||||||
$ZUUL_CLONER --cache-dir \
|
|
||||||
/opt/git \
|
|
||||||
--branch $BRANCH_NAME \
|
|
||||||
git://git.openstack.org \
|
|
||||||
openstack/requirements
|
|
||||||
cd openstack/requirements
|
|
||||||
$install_cmd -e .
|
|
||||||
popd
|
|
||||||
else
|
|
||||||
echo "PIP HARDCODE" > /tmp/tox_install.txt
|
|
||||||
if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
|
|
||||||
REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements"
|
|
||||||
fi
|
|
||||||
$install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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 "-e file://$PWD#egg=$CLIENT_NAME"
|
|
||||||
|
|
||||||
$install_cmd -U $*
|
|
||||||
exit $?
|
|
6
tox.ini
6
tox.ini
@ -11,9 +11,9 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
LC_ALL=C
|
LC_ALL=C
|
||||||
PYTHONWARNINGS=default::DeprecationWarning
|
PYTHONWARNINGS=default::DeprecationWarning
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command =
|
install_command = pip install {opts} {packages}
|
||||||
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
# Delete bytecodes from normal directories before running tests.
|
# Delete bytecodes from normal directories before running tests.
|
||||||
# Note that bytecodes in dot directories will not be deleted
|
# Note that bytecodes in dot directories will not be deleted
|
||||||
|
Loading…
Reference in New Issue
Block a user