Skip to content

Commit 020296f

Browse files
prathambandePratham Bande
andauthored
Using python -m venv for Venv Creation for UV Lock Scenarios (#2829)
* using python -m venv for venv creation for all scenarios * changing approach * Added log message for indication --------- Co-authored-by: Pratham Bande <prathambande@microsoft.com>
1 parent bb112eb commit 020296f

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ install_python_packages_impl() {
168168
echo "Python Virtual Environment: $VIRTUALENVIRONMENTNAME"
169169

170170
if [ -e "pyproject.toml" ] && [ -e "uv.lock" ] && [ ! -e "$REQUIREMENTS_TXT_FILE" ]; then
171-
echo "Detected uv.lock (and no $REQUIREMENTS_TXT_FILE); creating virtual environment with uv..."
171+
echo "Detected uv.lock (and no $REQUIREMENTS_TXT_FILE)"
172172
echo "Installing uv..."
173173
START_TIME=$SECONDS
174174
InstallUv="python -m pip install uv"
@@ -177,15 +177,23 @@ install_python_packages_impl() {
177177
ELAPSED_TIME=$(($SECONDS - $START_TIME))
178178
echo "Installing uv done in $ELAPSED_TIME sec(s)."
179179
CreateVenvCommand="uv venv --link-mode=copy --system-site-packages $VIRTUALENVIRONMENTNAME"
180+
VIRTUALENVIRONMENTOPTIONS="$VIRTUALENVIRONMENTOPTIONS --system-site-packages"
180181
else
181182
if [ -e "$REQUIREMENTS_TXT_FILE" ]; then
182183
VIRTUALENVIRONMENTOPTIONS="$VIRTUALENVIRONMENTOPTIONS --system-site-packages"
183184
fi
184185
CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS"
185186
fi
186187

187-
echo Creating virtual environment...
188+
if [ "$CreateVenvWithPythonVenv" = "true" ]; then
189+
if [[ "$CreateVenvCommand" == *"uv venv"* ]]; then
190+
echo "Using Python's built-in venv for virtual environment creation"
191+
fi
192+
CreateVenvCommand="$python -m $VIRTUALENVIRONMENTMODULE $VIRTUALENVIRONMENTNAME $VIRTUALENVIRONMENTOPTIONS"
193+
fi
188194

195+
echo Creating virtual environment...
196+
189197
echo "BuildCommands=$CreateVenvCommand" >> "$COMMAND_MANIFEST_FILE"
190198

191199
# Execute the resolved CreateVenvCommand

0 commit comments

Comments
 (0)