diff options
| author | Tom Rini <[email protected]> | 2025-04-15 12:10:26 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-24 15:37:27 -0600 |
| commit | efd00b03455644b18eaf2b6dcd07f6d55b95b39e (patch) | |
| tree | 037d898da2753ccf92134099cc643e51b7b3d38d /tools/docker/Dockerfile | |
| parent | 10f48365112b164bee6564033ab682747efcb483 (diff) | |
python: Use and refer to the venv module rather than virtualenv
Using some form of sandbox with Python modules is a long standing best
practice with the language. There are a number of ways to have a Python
sandbox be created. At this point in time, it seems the Python community
is moving towards using the "venv" module provided with Python rather
than a separate tool. To match that we make the following changes:
- Refer to a "Python sandbox" rather than virtualenv in comments, etc.
- Install the python3-venv module in our container and not virtualenv.
- In our CI files, invoke "python -m venv" rather than "virtualenv".
- In documentation, tell users to install python3-venv and not
virtualenv.
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'tools/docker/Dockerfile')
| -rw-r--r-- | tools/docker/Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index a0fd174ff60..dec1d516a6c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -124,7 +124,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ python3-dev \ python3-pip \ python3-sphinx \ - python3-virtualenv \ + python3-venv \ rpm2cpio \ sbsigntool \ socat \ @@ -136,7 +136,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ texinfo \ util-linux \ uuid-dev \ - virtualenv \ vboot-kernel-utils \ vboot-utils \ xilinx-bootgen \ @@ -313,7 +312,7 @@ RUN wget -O /tmp/binman-requirements.txt https://source.denx.de/u-boot/u-boot/-/ RUN wget -O /tmp/buildman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/buildman/requirements.txt RUN wget -O /tmp/patman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/patman/requirements.txt RUN wget -O /tmp/u_boot_pylib-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/u_boot_pylib/requirements.txt -RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ +RUN python3 -m venv /tmp/venv && \ . /tmp/venv/bin/activate && \ pip install -r /tmp/pytest-requirements.txt \ -r /tmp/sphinx-requirements.txt \ |