[libvirt] [jenkins-ci PATCH 0/3] Add python3 & python3-setup tools to the base project
The former can be added to tbe base project as a direct or indirect dependency of the most part of the projects in libvirt-jenkins-ci. The latter is needed in order to use pip module for ansible, which is used to install meson in platforms where it's either not supported or doesn't match the minimum required version. Fabiano Fidêncio (3): guests: Move python3 to the base project mappings: Add python3-setuptools guests: Add python3-setuptools to the base project guests/vars/mappings.yml | 4 ++++ guests/vars/projects/base.yml | 2 ++ guests/vars/projects/libvirt-dbus.yml | 1 - guests/vars/projects/libvirt-python.yml | 1 - guests/vars/projects/osinfo-db-tools.yml | 1 - guests/vars/projects/osinfo-db.yml | 1 - guests/vars/projects/virt-manager.yml | 1 - 7 files changed, 6 insertions(+), 5 deletions(-) -- 2.23.0
As a bunch of projects already directly depend on python3 (libvirt-dbus, libvirt-python, osinfo-db-tools, osinfo-db, virt-manager), and some depend on it indirectly (as libvirt or anything else depending on flake8), let's add python3 to the base project. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/base.yml | 1 + guests/vars/projects/libvirt-dbus.yml | 1 - guests/vars/projects/libvirt-python.yml | 1 - guests/vars/projects/osinfo-db-tools.yml | 1 - guests/vars/projects/osinfo-db.yml | 1 - guests/vars/projects/virt-manager.yml | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index ec04fdf..23cf14d 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -26,6 +26,7 @@ packages: - perl - pkg-config - python2-setuptools + - python3 - python3-pip - rpmbuild - screen diff --git a/guests/vars/projects/libvirt-dbus.yml b/guests/vars/projects/libvirt-dbus.yml index ce902cb..481693d 100644 --- a/guests/vars/projects/libvirt-dbus.yml +++ b/guests/vars/projects/libvirt-dbus.yml @@ -3,7 +3,6 @@ packages: - dbus-daemon - flake8 - glib2 - - python3 - python3-dbus - python3-gi - python3-pytest diff --git a/guests/vars/projects/libvirt-python.yml b/guests/vars/projects/libvirt-python.yml index 774da26..86b5aab 100644 --- a/guests/vars/projects/libvirt-python.yml +++ b/guests/vars/projects/libvirt-python.yml @@ -4,7 +4,6 @@ packages: - python2-devel - python2-lxml - python2-nose - - python3 - python3-devel - python3-lxml - python3-nose diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml index ad38a1f..1ad7944 100644 --- a/guests/vars/projects/osinfo-db-tools.yml +++ b/guests/vars/projects/osinfo-db-tools.yml @@ -6,6 +6,5 @@ packages: - libsoup - libxml2 - libxslt - - python3 - python3-pytest - python3-requests diff --git a/guests/vars/projects/osinfo-db.yml b/guests/vars/projects/osinfo-db.yml index 56bd77a..71ec3ac 100644 --- a/guests/vars/projects/osinfo-db.yml +++ b/guests/vars/projects/osinfo-db.yml @@ -1,7 +1,6 @@ --- packages: - intltool - - python3 - python3-lxml - python3-pytest - python3-requests diff --git a/guests/vars/projects/virt-manager.yml b/guests/vars/projects/virt-manager.yml index 0b7266a..72fa482 100644 --- a/guests/vars/projects/virt-manager.yml +++ b/guests/vars/projects/virt-manager.yml @@ -3,7 +3,6 @@ packages: - gtk-update-icon-cache - intltool - isoinfo - - python3 - python3-gi - python3-libxml2 - python3-requests -- 2.23.0
python3-setuptools is an ansible pip module dependency, which is not automatically pulled in. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/mappings.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index ba0f1cf..02bf8fd 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -872,6 +872,10 @@ mappings: FreeBSD: py36-requests CentOS7: python36-requests + python3-setuptools: + default: python3-setuptools + FreeBSD: py36-setuptools + qemu-img: default: qemu-utils rpm: qemu-img -- 2.23.0
python3-setuptools is an ansible pip module dependency, which is not automatically pulled in. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/base.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index 23cf14d..275211c 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -28,6 +28,7 @@ packages: - python2-setuptools - python3 - python3-pip + - python3-setuptools - rpmbuild - screen - strace -- 2.23.0
On Wed, 2019-10-09 at 17:08 +0200, Fabiano Fidêncio wrote:
The former can be added to tbe base project as a direct or indirect dependency of the most part of the projects in libvirt-jenkins-ci. The latter is needed in order to use pip module for ansible, which is used to install meson in platforms where it's either not supported or doesn't match the minimum required version.
Fabiano Fidêncio (3): guests: Move python3 to the base project mappings: Add python3-setuptools guests: Add python3-setuptools to the base project
Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Fabiano Fidêncio