guests: fix confusion over virtualenv vs venv

QEMU requires the 'venv' module. On all distros except Debian
derivatives this is available by default with 'python3', but
Debian requires 'python3-venv'. We are pulling in 'virtualenv'
on most distros which we didn't need, and 'venv' on Debian
which we did need, but which is different from 'virtualenv'.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

21 files changed, 5 insertions, 31 deletions

diff --git a/guests/lcitool/lcitool/ansible/vars/mappings.yml b/guests/lcitool/lcitool/ansible/vars/mappings.yml
index 0041b90..d32b414 100644
--- a/guests/lcitool/lcitool/ansible/vars/mappings.yml
+++ b/guests/lcitool/lcitool/ansible/vars/mappings.yml
@@ -1687,15 +1687,10 @@ mappings:
     pkg: py38-sphinx_rtd_theme
     rpm: python3-sphinx_rtd_theme
 
-  python3-virtualenv:
-    apk: py3-virtualenv
+  python3-venv:
+    default: python3
     deb: python3-venv
-    pkg: py38-virtualenv
-    rpm: python3-virtualenv
-    AlmaLinux:
-    CentOS:
-    AlmaLinux8: python3-virtualenv
-    CentOSStream8: python3-virtualenv
+    OpenSUSE: python3-base
 
   python3-wheel:
     default: python3-wheel
@@ -2097,9 +2092,6 @@ pypi_mappings:
   python3-sphinx-rtd-theme:
     default: sphinx-rtd-theme
 
-  python3-virtualenv:
-    default: virtualenv
-
 
 # CPAN mappings work like PyPi mappings, the only difference being that
 # installing a specific version of a CPAN package is not supported.
diff --git a/guests/lcitool/lcitool/ansible/vars/projects/qemu.yml b/guests/lcitool/lcitool/ansible/vars/projects/qemu.yml
index d9c0602..f656ef3 100644
--- a/guests/lcitool/lcitool/ansible/vars/projects/qemu.yml
+++ b/guests/lcitool/lcitool/ansible/vars/projects/qemu.yml
@@ -93,7 +93,7 @@ packages:
  - python3-pip
  - python3-sphinx
  - python3-sphinx-rtd-theme
- - python3-virtualenv
+ - python3-venv
  - rpm2cpio
  - sdl2
  - sdl2-image
diff --git a/guests/lcitool/tests/data/packages/in/packages.yml b/guests/lcitool/tests/data/packages/in/packages.yml
index 2e02e19..c469850 100644
--- a/guests/lcitool/tests/data/packages/in/packages.yml
+++ b/guests/lcitool/tests/data/packages/in/packages.yml
@@ -244,7 +244,7 @@ packages:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx-rtd-theme
-- python3-virtualenv
+- python3-venv
 - python3-wheel
 - qemu
 - qemu-img
diff --git a/guests/lcitool/tests/data/packages/out/almalinux-8.yml b/guests/lcitool/tests/data/packages/out/almalinux-8.yml
index f5b7815..1955702 100644
--- a/guests/lcitool/tests/data/packages/out/almalinux-8.yml
+++ b/guests/lcitool/tests/data/packages/out/almalinux-8.yml
@@ -213,7 +213,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/alpine-314.yml b/guests/lcitool/tests/data/packages/out/alpine-314.yml
index bb90109..406b80e 100644
--- a/guests/lcitool/tests/data/packages/out/alpine-314.yml
+++ b/guests/lcitool/tests/data/packages/out/alpine-314.yml
@@ -187,7 +187,6 @@ native:
 - py3-setuptools
 - py3-sphinx
 - py3-sphinx_rtd_theme
-- py3-virtualenv
 - py3-wheel
 - py3-yaml
 - python3
diff --git a/guests/lcitool/tests/data/packages/out/alpine-315.yml b/guests/lcitool/tests/data/packages/out/alpine-315.yml
index 2422e65..787e59d 100644
--- a/guests/lcitool/tests/data/packages/out/alpine-315.yml
+++ b/guests/lcitool/tests/data/packages/out/alpine-315.yml
@@ -187,7 +187,6 @@ native:
 - py3-setuptools
 - py3-sphinx
 - py3-sphinx_rtd_theme
-- py3-virtualenv
 - py3-wheel
 - py3-yaml
 - python3
diff --git a/guests/lcitool/tests/data/packages/out/alpine-edge.yml b/guests/lcitool/tests/data/packages/out/alpine-edge.yml
index 6d92cd2..eaac0e5 100644
--- a/guests/lcitool/tests/data/packages/out/alpine-edge.yml
+++ b/guests/lcitool/tests/data/packages/out/alpine-edge.yml
@@ -186,7 +186,6 @@ native:
 - py3-setuptools
 - py3-sphinx
 - py3-sphinx_rtd_theme
-- py3-virtualenv
 - py3-wheel
 - py3-yaml
 - python3
diff --git a/guests/lcitool/tests/data/packages/out/centos-stream-8.yml b/guests/lcitool/tests/data/packages/out/centos-stream-8.yml
index d472ef0..866fc62 100644
--- a/guests/lcitool/tests/data/packages/out/centos-stream-8.yml
+++ b/guests/lcitool/tests/data/packages/out/centos-stream-8.yml
@@ -212,7 +212,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/centos-stream-9.yml b/guests/lcitool/tests/data/packages/out/centos-stream-9.yml
index e46b706..320b75f 100644
--- a/guests/lcitool/tests/data/packages/out/centos-stream-9.yml
+++ b/guests/lcitool/tests/data/packages/out/centos-stream-9.yml
@@ -240,4 +240,3 @@ native:
 - zlib-static
 pypi:
 - pillow
-- virtualenv
diff --git a/guests/lcitool/tests/data/packages/out/fedora-34.yml b/guests/lcitool/tests/data/packages/out/fedora-34.yml
index a094955..3c6c65d 100644
--- a/guests/lcitool/tests/data/packages/out/fedora-34.yml
+++ b/guests/lcitool/tests/data/packages/out/fedora-34.yml
@@ -228,7 +228,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/fedora-35.yml b/guests/lcitool/tests/data/packages/out/fedora-35.yml
index a094955..3c6c65d 100644
--- a/guests/lcitool/tests/data/packages/out/fedora-35.yml
+++ b/guests/lcitool/tests/data/packages/out/fedora-35.yml
@@ -228,7 +228,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/fedora-36.yml b/guests/lcitool/tests/data/packages/out/fedora-36.yml
index fb49504..09b908b 100644
--- a/guests/lcitool/tests/data/packages/out/fedora-36.yml
+++ b/guests/lcitool/tests/data/packages/out/fedora-36.yml
@@ -227,7 +227,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml b/guests/lcitool/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml
index 1a286d7..888c07a 100644
--- a/guests/lcitool/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml
+++ b/guests/lcitool/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml
@@ -178,7 +178,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/fedora-rawhide.yml b/guests/lcitool/tests/data/packages/out/fedora-rawhide.yml
index 0ce53a1..5badda4 100644
--- a/guests/lcitool/tests/data/packages/out/fedora-rawhide.yml
+++ b/guests/lcitool/tests/data/packages/out/fedora-rawhide.yml
@@ -226,7 +226,6 @@ native:
 - python3-setuptools
 - python3-sphinx
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu-img
 - qemu-kvm
diff --git a/guests/lcitool/tests/data/packages/out/freebsd-12.yml b/guests/lcitool/tests/data/packages/out/freebsd-12.yml
index ee10dbf..6612955 100644
--- a/guests/lcitool/tests/data/packages/out/freebsd-12.yml
+++ b/guests/lcitool/tests/data/packages/out/freebsd-12.yml
@@ -143,7 +143,6 @@ native:
 - py38-setuptools
 - py38-sphinx
 - py38-sphinx_rtd_theme
-- py38-virtualenv
 - py38-wheel
 - py38-yaml
 - python3
diff --git a/guests/lcitool/tests/data/packages/out/freebsd-13.yml b/guests/lcitool/tests/data/packages/out/freebsd-13.yml
index ee10dbf..6612955 100644
--- a/guests/lcitool/tests/data/packages/out/freebsd-13.yml
+++ b/guests/lcitool/tests/data/packages/out/freebsd-13.yml
@@ -143,7 +143,6 @@ native:
 - py38-setuptools
 - py38-sphinx
 - py38-sphinx_rtd_theme
-- py38-virtualenv
 - py38-wheel
 - py38-yaml
 - python3
diff --git a/guests/lcitool/tests/data/packages/out/freebsd-current.yml b/guests/lcitool/tests/data/packages/out/freebsd-current.yml
index ee10dbf..6612955 100644
--- a/guests/lcitool/tests/data/packages/out/freebsd-current.yml
+++ b/guests/lcitool/tests/data/packages/out/freebsd-current.yml
@@ -143,7 +143,6 @@ native:
 - py38-setuptools
 - py38-sphinx
 - py38-sphinx_rtd_theme
-- py38-virtualenv
 - py38-wheel
 - py38-yaml
 - python3
diff --git a/guests/lcitool/tests/data/packages/out/macos-11.yml b/guests/lcitool/tests/data/packages/out/macos-11.yml
index a6a8e82..88dcbba 100644
--- a/guests/lcitool/tests/data/packages/out/macos-11.yml
+++ b/guests/lcitool/tests/data/packages/out/macos-11.yml
@@ -155,4 +155,3 @@ pypi:
 - requests
 - sphinx
 - sphinx-rtd-theme
-- virtualenv
diff --git a/guests/lcitool/tests/data/packages/out/macos-12.yml b/guests/lcitool/tests/data/packages/out/macos-12.yml
index a6a8e82..88dcbba 100644
--- a/guests/lcitool/tests/data/packages/out/macos-12.yml
+++ b/guests/lcitool/tests/data/packages/out/macos-12.yml
@@ -155,4 +155,3 @@ pypi:
 - requests
 - sphinx
 - sphinx-rtd-theme
-- virtualenv
diff --git a/guests/lcitool/tests/data/packages/out/opensuse-leap-153.yml b/guests/lcitool/tests/data/packages/out/opensuse-leap-153.yml
index 4a531ce..6f033db 100644
--- a/guests/lcitool/tests/data/packages/out/opensuse-leap-153.yml
+++ b/guests/lcitool/tests/data/packages/out/opensuse-leap-153.yml
@@ -221,7 +221,6 @@ native:
 - python3-selinux
 - python3-setuptools
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu
 - qemu-tools
diff --git a/guests/lcitool/tests/data/packages/out/opensuse-tumbleweed.yml b/guests/lcitool/tests/data/packages/out/opensuse-tumbleweed.yml
index 70b8ac5..cd05e73 100644
--- a/guests/lcitool/tests/data/packages/out/opensuse-tumbleweed.yml
+++ b/guests/lcitool/tests/data/packages/out/opensuse-tumbleweed.yml
@@ -222,7 +222,6 @@ native:
 - python3-selinux
 - python3-setuptools
 - python3-sphinx_rtd_theme
-- python3-virtualenv
 - python3-wheel
 - qemu
 - qemu-tools