From ab8e59ffc29e79760442234ccb3d20e24987be90 Mon Sep 17 00:00:00 2001 From: Pratham Bande Date: Thu, 12 Mar 2026 16:23:51 +0530 Subject: [PATCH 1/2] using python -m venv for venv creation for all scenarios --- .../Python/PythonBashBuildSnippet.sh.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl b/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl index a93efe7902..8363ff1cd0 100644 --- a/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl +++ b/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl @@ -176,16 +176,15 @@ install_python_packages_impl() { $python -m pip install uv ELAPSED_TIME=$(($SECONDS - $START_TIME)) echo "Installing uv done in $ELAPSED_TIME sec(s)." - CreateVenvCommand="uv venv --link-mode=copy --system-site-packages $VIRTUALENVIRONMENTNAME" else if [ -e "$REQUIREMENTS_TXT_FILE" ]; then VIRTUALENVIRONMENTOPTIONS="$VIRTUALENVIRONMENTOPTIONS --system-site-packages" fi - CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS" fi - - echo Creating virtual environment... + CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS" + echo Creating virtual environment... + echo "BuildCommands=$CreateVenvCommand" >> "$COMMAND_MANIFEST_FILE" # Execute the resolved CreateVenvCommand From 23b4afb75c186dfcd341f3e8d93a1cebf516941c Mon Sep 17 00:00:00 2001 From: Pratham Bande Date: Tue, 24 Mar 2026 12:35:24 +0530 Subject: [PATCH 2/2] changing approach --- .../Python/PythonBashBuildSnippet.sh.tpl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl b/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl index 8363ff1cd0..df8f7632dc 100644 --- a/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl +++ b/src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl @@ -168,7 +168,7 @@ install_python_packages_impl() { echo "Python Virtual Environment: $VIRTUALENVIRONMENTNAME" if [ -e "pyproject.toml" ] && [ -e "uv.lock" ] && [ ! -e "$REQUIREMENTS_TXT_FILE" ]; then - echo "Detected uv.lock (and no $REQUIREMENTS_TXT_FILE); creating virtual environment with uv..." + echo "Detected uv.lock (and no $REQUIREMENTS_TXT_FILE)" echo "Installing uv..." START_TIME=$SECONDS InstallUv="python -m pip install uv" @@ -176,13 +176,19 @@ install_python_packages_impl() { $python -m pip install uv ELAPSED_TIME=$(($SECONDS - $START_TIME)) echo "Installing uv done in $ELAPSED_TIME sec(s)." + CreateVenvCommand="uv venv --link-mode=copy --system-site-packages $VIRTUALENVIRONMENTNAME" + VIRTUALENVIRONMENTOPTIONS="$VIRTUALENVIRONMENTOPTIONS --system-site-packages" else if [ -e "$REQUIREMENTS_TXT_FILE" ]; then VIRTUALENVIRONMENTOPTIONS="$VIRTUALENVIRONMENTOPTIONS --system-site-packages" fi + CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS" + fi + + if [ "$CreateVenvWithPythonVenv" = "true" ]; then + CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS" fi - CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS" echo Creating virtual environment... echo "BuildCommands=$CreateVenvCommand" >> "$COMMAND_MANIFEST_FILE"