openstack/monasca-persister
Code Issues Proposed changes

Sync tools/tox_install.sh

Browse Source 
Sync tools/tox_install.sh with python-openstackclient. This brings in
the following improvements:

* Do not leave temporary directory around, instead delete temporary
  directory directly after usage (change
  I939eae82dba3287fd4e4086128ebf4609a0e0770).
* Do not set ZUUL_BRANCH explicitely and remove unused if condition
  (change I0077c986a17d6bb92791474e03d1e77776e9382f).

Change-Id: I89b86e20d063f53338c87e76d9a39d600d35f3cd
This commit is contained in:
Andreas Jaeger 2016-08-30 20:17:06 +02:00
parent 0529f0ca3a
commit a9b647d743
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/tox_install.sh
View File

@ -17,21 +17,19 @@ CONSTRAINTS_FILE=$1
shift shift
install_cmd="pip install" install_cmd="pip install"
if [[ $CONSTRAINTS_FILE != "unconstrained" ]]; then mydir=$(mktemp -dt "$PACKAGE_NAME-tox_install-XXXXXXX")
trap "rm -rf $mydir" EXIT
mydir=$(mktemp -dt "$PACKAGE_NAME-tox_install-XXXXXXX") localfile=$mydir/upper-constraints.txt
localfile=$mydir/upper-constraints.txt if [[ $CONSTRAINTS_FILE != http* ]]; then
if [[ $CONSTRAINTS_FILE != http* ]]; then
CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
fi fi
curl $CONSTRAINTS_FILE -k -o $localfile curl $CONSTRAINTS_FILE -k -o $localfile
install_cmd="$install_cmd -c$localfile" install_cmd="$install_cmd -c$localfile"
if [ $requirements_installed -eq 0 ]; then if [ $requirements_installed -eq 0 ]; then
echo "ALREADY INSTALLED" > /tmp/tox_install.txt echo "ALREADY INSTALLED" > /tmp/tox_install.txt
echo "Requirements already installed; using existing package" echo "Requirements already installed; using existing package"
elif [ -x "$ZUUL_CLONER" ]; then elif [ -x "$ZUUL_CLONER" ]; then
export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH}
echo "ZUUL CLONER" > /tmp/tox_install.txt echo "ZUUL CLONER" > /tmp/tox_install.txt
pushd $mydir pushd $mydir
$ZUUL_CLONER --cache-dir \ $ZUUL_CLONER --cache-dir \
@ -42,16 +40,18 @@ if [[ $CONSTRAINTS_FILE != "unconstrained" ]]; then
cd openstack/requirements cd openstack/requirements
$install_cmd -e . $install_cmd -e .
popd popd
else else
echo "PIP HARDCODE" > /tmp/tox_install.txt echo "PIP HARDCODE" > /tmp/tox_install.txt
if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements" REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements"
fi fi
$install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION} $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
fi
edit-constraints $localfile -- $PACKAGE_NAME "-e file://$PWD#egg=$PACKAGE_NAME"
fi 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 $* $install_cmd -U $*
exit $? exit $?