From 38724f7daaf914b1675031f6bb01bee34a5df0f7 Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Thu, 20 Jan 2022 16:05:56 -0800 Subject: [PATCH] regression_test: Check if user is using anaconda, if so, install lanforge-scripts appropriately if the user is not using any virtual environment, install from pip using --user flag Signed-off-by: Matthew Stidham --- py-scripts/regression_test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh index 235309ef..f484dace 100755 --- a/py-scripts/regression_test.sh +++ b/py-scripts/regression_test.sh @@ -107,12 +107,13 @@ PYTHON_ENVIRONMENT=$(which python3) git pull --rebase python3 -m pip install --upgrade pip -if [ -d "/home/lanforge/lanforge_env" ] -then +if [ -d "/home/lanforge/lanforge_env" ]; then source /home/lanforge/lanforge_env/bin/activate pip3 install --upgrade lanforge-scripts +elif [ -d "/home/lanforge/anaconda3" ]; then + pip3 install --upgrade lanforge-scripts else - pip3 install --user -r ../requirements.txt --upgrade + pip3 install --user lanforge_scripts --upgrade fi if [[ ${#SSID_USED} -eq 0 ]]; then #Network credentials