Properly handle upper-constraints
Seems like we got broken after virtualbmc was added to the constraints, this patch fixes it. Change-Id: Ic17a7e1fb82fbb20fd09adfec09b0c8802d73d20
This commit is contained in:
parent
ef2c8818e6
commit
c65df802ba
55
tools/tox_install.sh
Executable file
55
tools/tox_install.sh
Executable file
@ -0,0 +1,55 @@
|
|||||||
|
#!/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=virtualbmc
|
||||||
|
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 $?
|
3
tox.ini
3
tox.ini
@ -5,12 +5,13 @@ envlist = py35,py27,pep8
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U --force-reinstall -c{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}
|
||||||
PYTHONDONTWRITEBYTECODE = 1
|
PYTHONDONTWRITEBYTECODE = 1
|
||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
LC_ALL=en_US.UTF-8
|
LC_ALL=en_US.UTF-8
|
||||||
TESTS_DIR=./virtualbmc/tests/unit/
|
TESTS_DIR=./virtualbmc/tests/unit/
|
||||||
|
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 =
|
deps =
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = ostestr {posargs}
|
commands = ostestr {posargs}
|
||||||
|
Loading…
Reference in New Issue
Block a user