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: I600fa540b45e8dfddb18c36cae778fcddccff705
This commit is contained in:
parent
15496e0c0f
commit
a7df9d88f5
|
@ -1,53 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# [liujiong] This file is refer to tox_install.sh in neutron-lib.
|
|
||||||
# Library constraint file contains this library version pin that is in conflict
|
|
||||||
# with installing the library 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
|
|
||||||
LIB_NAME=python-barbicanclient
|
|
||||||
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
CONSTRAINTS_FILE=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
install_cmd="pip install"
|
|
||||||
mydir=$(mktemp -dt "$LIB_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 "Requirements already installed; using existing package"
|
|
||||||
elif [ -x "$ZUUL_CLONER" ]; then
|
|
||||||
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
|
|
||||||
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 -- $LIB_NAME "-e file://$PWD#egg=$LIB_NAME"
|
|
||||||
|
|
||||||
$install_cmd -U $*
|
|
||||||
exit $?
|
|
9
tox.ini
9
tox.ini
|
@ -5,10 +5,12 @@ skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
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}
|
install_command = pip install {opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
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 =
|
commands =
|
||||||
coverage erase
|
coverage erase
|
||||||
|
@ -30,8 +32,7 @@ commands = python setup.py build_sphinx
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
# This tox env is purely to make local test development easier
|
# This tox env is purely to make local test development easier
|
||||||
# Note: This requires local running instances of Barbican
|
# Note: This requires local running instances of Barbican
|
||||||
deps =
|
deps = {[testenv]deps}
|
||||||
{[testenv]deps}
|
|
||||||
commands = nosetests {toxinidir}/functionaltests/{posargs} -v
|
commands = nosetests {toxinidir}/functionaltests/{posargs} -v
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
|
|
Loading…
Reference in New Issue