Prepare changes for build_python.sh for ubuntu 24.04 usage (#34016)

Changes: - use `-m venv` to create the virtualenv - ensure `libgirepository1.0-dev` is installed, so that we are able to build/install pygobject
project-chip · Aug 8, 2024 · 1265200 · 1265200
1 parent f154d1b
commit 1265200
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/integrations/docker/images/base/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile
@@ -59,6 +59,7 @@ RUN set -x \
     libdmalloc-dev \
     libgif-dev \
     libgirepository-1.0-1 \
+    libgirepository1.0-dev \
     libglib2.0-dev \
     libical-dev \
     libjpeg-dev \

diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-57 : [Telink] Update Docker image (Zephyr update)
+58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)
diff --git a/scripts/build_python.sh b/scripts/build_python.sh
@@ -222,10 +222,10 @@ if [ -n "$install_virtual_env" ]; then
     if [ "$clean_virtual_env" = "yes" ]; then
         # Create a virtual environment that has access to the built python tools
         echo_blue "Creating a clear VirtualEnv in '$ENVIRONMENT_ROOT' ..."
-        virtualenv --clear "$ENVIRONMENT_ROOT"
+        python -m venv --clear "$ENVIRONMENT_ROOT"
     elif [ ! -f "$ENVIRONMENT_ROOT"/bin/activate ]; then
         echo_blue "Creating a new VirtualEnv in '$ENVIRONMENT_ROOT' ..."
-        virtualenv "$ENVIRONMENT_ROOT"
+        python -m venv "$ENVIRONMENT_ROOT"
     fi
 
     source "$ENVIRONMENT_ROOT"/bin/activate
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		57 : [Telink] Update Docker image (Zephyr update)
		58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)