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: Ie2985abfafa71177b5800a8ca5a97381662bfea9
This commit is contained in:
Andreas Jaeger 2017-12-01 15:18:25 +01:00
parent ce71e054de
commit 6ffc33b6e5
2 changed files with 5 additions and 68 deletions

View File

@ -1,57 +0,0 @@
#!/usr/bin/env bash
# Constraint file contains this package version pin that is in conflict
# with installing the package 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
PACKAGE_NAME=monasca-statsd
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
set -e
git config --global url.https://git.openstack.org/.insteadOf git://git.openstack.org/
CONSTRAINTS_FILE=$1
shift
install_cmd="pip install"
mydir=$(mktemp -dt "$PACKAGE_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 -- $PACKAGE_NAME "-e file://$PWD#egg=$PACKAGE_NAME"
$install_cmd -U $*
exit $?

16
tox.ini
View File

@ -4,10 +4,6 @@ minversion = 2.5
skipsdist = True
[testenv]
setenv =
VIRTUAL_ENV={envdir}
OS_TEST_PATH=tests
CLIENT_NAME=monasca-statsd
passenv = http_proxy
HTTP_PROXY
https_proxy
@ -15,9 +11,10 @@ passenv = http_proxy
no_proxy
NO_PROXY
usedevelop = True
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}/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}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = bash
find
@ -27,21 +24,19 @@ commands =
[testenv:py27]
basepython = python2.7
deps = {[testenv]deps}
commands =
{[testenv]commands}
ostestr {posargs}
[testenv:py35]
basepython = python3.5
deps = {[testenv]deps}
commands =
{[testenv]commands}
ostestr {posargs}
[testenv:cover]
basepython = python2.7
deps = {[testenv]deps}
commands =
{[testenv]commands}
coverage erase
@ -49,7 +44,6 @@ commands =
coverage report
[testenv:debug]
deps = {[testenv]deps}
commands =
{[testenv]commands}
oslo_debug_helper -t {toxinidir}/tests {posargs}