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: Ib55145fd3f0ed0d8d56379c718e91ff55aa4aa27
This commit is contained in:
parent
b2bda29d20
commit
bad98c6722
@ -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-common
|
|
||||||
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 $?
|
|
7
tox.ini
7
tox.ini
@ -7,7 +7,6 @@ skipsdist = True
|
|||||||
usedevelop = True
|
usedevelop = True
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_TEST_PATH=monasca_common/tests
|
OS_TEST_PATH=monasca_common/tests
|
||||||
CLIENT_NAME=monasca-common
|
|
||||||
passenv = http_proxy
|
passenv = http_proxy
|
||||||
HTTP_PROXY
|
HTTP_PROXY
|
||||||
https_proxy
|
https_proxy
|
||||||
@ -17,8 +16,10 @@ passenv = http_proxy
|
|||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
find
|
find
|
||||||
rm
|
rm
|
||||||
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 -U {opts} {packages}
|
||||||
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 =
|
||||||
find {toxinidir} -type f -name '*.pyc' -delete
|
find {toxinidir} -type f -name '*.pyc' -delete
|
||||||
|
Loading…
x
Reference in New Issue
Block a user