Merge "pip-and-virtualenv: include python3-venv for Debuntu"

2019-10-28 00:01:51 +00:00 · 2019-10-28 00:01:51 +00:00 · 392ebeec68
commit 392ebeec68
parent 24e204eb5c f2e0b01336
3 changed files with 14 additions and 1 deletions
--- a/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
+++ b/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
@ -31,3 +31,6 @@ python-dev:
 python3-dev:
  installtype: source
  dib_python_version: 3
+# Separate package on debubuntu
+python3-venv:
+  dib_python_version: 3
--- a/diskimage_builder/elements/pip-and-virtualenv/pkg-map
+++ b/diskimage_builder/elements/pip-and-virtualenv/pkg-map
@ -7,6 +7,9 @@
    }
  },
  "family": {
+    "debian": {
+      "python3-venv": "python3-venv"
+    },
    "gentoo": {
      "python-pip": "dev-python/pip",
      "python3-pip": "dev-python/pip",
@ -28,6 +31,7 @@
  },
  "default": {
    "python-xml": "",
-    "python3": ""
+    "python3": "",
+    "python3-venv": ""
  }
 }
--- a/releasenotes/notes/python-venv-d5b04fcf57e460bf.yaml
+++ b/releasenotes/notes/python-venv-d5b04fcf57e460bf.yaml
@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The ``pip-and-virtualenv`` element also installs ``python3-venv``
+    on Python-3 Debian-like distributions to ensure
+    ``$DIB_PYTHON_VIRTUALENV`` works as expected.