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: I57b7cb9aff05f4f81f02b39b603f3480943f914e
This commit is contained in:
parent
c11f038e6e
commit
004144ab77
@ -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-glareclient
|
|
||||||
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
CONSTRAINTS_FILE=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
install_cmd="pip install"
|
|
||||||
if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
|
|
||||||
|
|
||||||
mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
|
|
||||||
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
|
|
||||||
export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH}
|
|
||||||
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
|
|
||||||
|
|
||||||
edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME"
|
|
||||||
fi
|
|
||||||
|
|
||||||
$install_cmd -U $*
|
|
||||||
exit $?
|
|
7
tox.ini
7
tox.ini
@ -5,15 +5,16 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
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}
|
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_NOCAPTURE=False
|
OS_STDOUT_NOCAPTURE=False
|
||||||
OS_STDERR_NOCAPTURE=False
|
OS_STDERR_NOCAPTURE=False
|
||||||
PYTHONHASHSEED=0
|
PYTHONHASHSEED=0
|
||||||
PYTHONDONTWRITEBYTECODE = 1
|
PYTHONDONTWRITEBYTECODE = 1
|
||||||
|
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps =
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = python setup.py testr --testr-args='{posargs}'
|
commands = python setup.py testr --testr-args='{posargs}'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user