From 83a4eb0130f8349ce4f543cca77a8c2e9a205c80 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 27 Dec 2019 10:55:21 +0100 Subject: [PATCH] make-dist: drop Python 2/3 autoselect virtualenv will prefer Python 3 over Python 2 if both are available. Signed-off-by: Nathan Cutler (cherry picked from commit 249bf81a32ff6d7046e525b947718d49b2314c13) --- make-dist | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/make-dist b/make-dist index 1bcad43920614..d3829b105e8d0 100755 --- a/make-dist +++ b/make-dist @@ -61,25 +61,11 @@ download_boost() { rm -rf src/boost } -_python_autoselect() { - python_command= - for interpreter in python2.7 python3 ; do - type $interpreter > /dev/null 2>&1 || continue - python_command=$interpreter - break - done - if [ -z "$python_command" ] ; then - echo "Could not find a suitable python interpreter! Bailing out." - exit 1 - fi - echo $python_command -} - build_dashboard_frontend() { CURR_DIR=`pwd` TEMP_DIR=`mktemp -d` - $CURR_DIR/src/tools/setup-virtualenv.sh --python=$(_python_autoselect) $TEMP_DIR + $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR $TEMP_DIR/bin/pip install nodeenv $TEMP_DIR/bin/nodeenv -p --node=10.13.0 cd src/pybind/mgr/dashboard/frontend -- 2.39.5