Install stable zhmcclient via requirements.txt

Till now, zhmcclient is installed from github master branch using
pip. As zhmcclient is now an official OpenStack requirement [1]
We can switch to install the latest stable version via
requirements.txt.

To allow newer versions in the future, an update to the
upper-constraints.txt in the OpenStack requirements repo is
required.

To bump the minimum just increase the version in requirements.txt
of nova-dpm and make sure, that newer versions are allowed
by OpenStack requirements (see above).

[1] https://review.openstack.org/413689

Change-Id: I0da5f9271ee3391a4648064207eab5b4fb7e26fb
Closes-Bug: #1655905
This commit is contained in:
Andreas Scheuring 2017-01-13 11:05:44 +01:00
parent 42f8e1f6c3
commit 28a7038550
3 changed files with 2 additions and 61 deletions

View File

@ -3,3 +3,4 @@
# process, which may cause wedges in the gate later.
pbr>=1.8 # Apache-2.0
zhmcclient>=0.9.0 # Apache 2.0 License

View File

@ -1,59 +0,0 @@
#!/usr/bin/env bash
# Base code from https://github.com/openstack/glance_store/blob/master/tools/tox_install.sh
#
# Library constraint file contains 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_DIR=python-zhmcclient
LIB_NAME=zhmcclient
LIB_LOCATION=git+https://github.com/zhmcclient/$LIB_DIR#egg=$LIB_NAME
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
set -e -x
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 "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 -- $LIB_NAME "-e $LIB_LOCATION"
$install_cmd -U $*
exit $?

View File

@ -12,9 +12,8 @@ VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
-egit+https://github.com/openstack/nova#egg=nova
-egit+https://github.com/zhmcclient/python-zhmcclient#egg=zhmcclient
whitelist_externals = bash
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 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
commands = bash tools/pretty_tox.sh '{posargs}'
[testenv:pep8]