From: Zack Cerza Date: Fri, 1 Apr 2022 18:01:32 +0000 (-0400) Subject: bootstrap: Allow absolute-path $VENV X-Git-Tag: 1.2.0~186^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d1547fc9d6aded39bfdc7ea28b1cf052cc264cb;p=teuthology.git bootstrap: Allow absolute-path $VENV Signed-off-by: Zack Cerza --- diff --git a/bootstrap b/bootstrap index 66f1212b4..f4234d9be 100755 --- a/bootstrap +++ b/bootstrap @@ -17,7 +17,7 @@ if [[ "$PYTHON" =~ "python2" ]]; then fi PYTHON=${PYTHON:-"python3"} -VENV=${VENV:-"virtualenv"} +VENV=${VENV:-"./virtualenv"} case "$(uname -s)" in Linux) @@ -142,18 +142,18 @@ fi export LC_ALL=en_US.UTF-8 -if [ -z "$NO_CLOBBER" ] || [ ! -e ./$VENV ]; then +if [ -z "$NO_CLOBBER" ] || [ ! -e $VENV ]; then python3 -m venv $VENV fi # First, upgrade pip -./$VENV/bin/pip install --upgrade pip +$VENV/bin/pip install --upgrade pip # Remove leftover .pyc files find teuthology -name '*.pyc' -exec rm {} \; # Install teuthology in editable mode -./$VENV/bin/pip install --editable '.[test]' +$VENV/bin/pip install --editable '.[test]' # Check to make sure requirements are met -./$VENV/bin/pip check +$VENV/bin/pip check