Constraint tox targets with upper-constraints.txt
Client version pin is maintained in upper-constraints.txt file, so we should replace it in the file with source based specifier before applying it to pip install, otherwise pip fails with: Could not satisfy constraints for 'python-neutronclient': installation from path or url cannot be constrained to a version Change-Id: I33302cdcab980a42c39dc9ec1e430add459615ff Closes-Bug: #1583050
This commit is contained in:

committed by
Akihiro Motoki

parent
81939ec495
commit
78d778cdec
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=python-neutronclient
|
||||||
|
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 $?
|
9
tox.ini
9
tox.ini
@@ -10,7 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
LANGUAGE=en_US:en
|
LANGUAGE=en_US:en
|
||||||
LC_ALL=C
|
LC_ALL=C
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
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
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
# Delete bytecodes from normal directories before running tests.
|
# Delete bytecodes from normal directories before running tests.
|
||||||
@@ -27,6 +28,8 @@ commands = flake8
|
|||||||
distribute = false
|
distribute = false
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
|
# TODO(ihrachys): remove once infra supports constraints for this target
|
||||||
|
install_command = pip install -U {opts} {packages}
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
@@ -40,6 +43,8 @@ setenv =
|
|||||||
OS_NEUTRONCLIENT_EXEC_DIR = {envdir}/bin
|
OS_NEUTRONCLIENT_EXEC_DIR = {envdir}/bin
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
|
# TODO(ihrachys): remove once infra supports constraints for this target
|
||||||
|
install_command = pip install -U {opts} {packages}
|
||||||
commands =
|
commands =
|
||||||
python setup.py test --coverage --coverage-package-name=neutronclient --testr-args='{posargs}'
|
python setup.py test --coverage --coverage-package-name=neutronclient --testr-args='{posargs}'
|
||||||
coverage report
|
coverage report
|
||||||
@@ -48,6 +53,8 @@ commands =
|
|||||||
commands = sphinx-build -W -b html doc/source doc/build/html
|
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
|
# TODO(ihrachys): remove once infra supports constraints for this target
|
||||||
|
install_command = pip install -U {opts} {packages}
|
||||||
commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
|
Reference in New Issue
Block a user