openstack/python-glanceclient
Code Issues Proposed changes

Improve tools/tox_install.sh

Browse Source 
Inspired from the tox_install script in the python-openstackclient, this
commit brings in the following improvements to python-glanceclient's
tools/tox_install.sh:

* 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: Ibed7e2fbe35d2f2a520383e36ad31a5e7c8ef548
This commit is contained in:
Andreas Jaeger
2016-08-30 19:44:09 +02:00
parent fec9b5f5e3
commit 27f0c35a72
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tox_install.sh
View File

@@ -15,9 +15,8 @@ CONSTRAINTS_FILE=$1
shift shift
install_cmd="pip install" install_cmd="pip install"
if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX") mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
trap "rm -rf $mydir" EXIT
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
@@ -29,7 +28,6 @@ if [ $CONSTRAINTS_FILE != "unconstrained" ]; 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 \
@@ -48,8 +46,10 @@ if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
$install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION} $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
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 -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME" edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME"
fi
$install_cmd -U $* $install_cmd -U $*
exit $? exit $?