Drop the dependency of python headers

As it is no longer needed after dropping the passfd module. Signed-off-by: Xu Han <[email protected]>
avocado-framework · May 16, 2023 · 1814b18 · 1814b18
1 parent 6822af1
commit 1814b18
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 17 deletions.
diff --git a/avocado-plugins-vt.spec b/avocado-plugins-vt.spec
@@ -68,7 +68,7 @@ Xunit output, among others.
 
 %package -n python3-%{name}
 Summary: %{summary}
-Requires: python3, python3-devel, python3-avocado >= 51.0, python3-aexpect
+Requires: python3, python3-avocado >= 51.0, python3-aexpect
 Requires: python3-netifaces
 %{?python_provide:%python_provide python3-%{srcname}}
 %description -n python3-%{name}
@@ -104,6 +104,11 @@ Xunit output, among others.
 
 
 %changelog
+* Fri May  5 2023 Xu Han <[email protected]> - 100.1-2
+- Removed python3-devel dependency
+- Replaced passfd module with Python's built-in facility
+- Removed simplejson dependency
+
 * Thu Jan 19 2023 Cleber Rosa <[email protected]> - 100.1-1
 - New release
 

diff --git a/contrib/containers/ci/centos-8.1.docker b/contrib/containers/ci/centos-8.1.docker
@@ -1,4 +1,4 @@
 FROM centos:8.1.1911
 LABEL description "Centos 8 image used on integration checks, such as cirrus-ci"
-RUN dnf -y install git xz tcpdump nc iproute iputils gcc python3-devel qemu-kvm qemu-img diffutils
+RUN dnf -y install git xz tcpdump nc iproute iputils gcc qemu-kvm qemu-img diffutils
 RUN dnf -y clean all
diff --git a/contrib/containers/ci/fedora-35.docker b/contrib/containers/ci/fedora-35.docker
@@ -1,6 +1,6 @@
 FROM fedora:35
 LABEL description "Fedora image used on integration checks, such as cirrus-ci"
-RUN dnf -y install make python3-wheel python3-pip git xz tcpdump nc iproute iputils gcc python3-devel qemu-kvm qemu-img
+RUN dnf -y install make python3-wheel python3-pip git xz tcpdump nc iproute iputils gcc qemu-kvm qemu-img
 RUN dnf -y clean all
 RUN mkdir -p /var/lib/avocado/data/avocado-vt/images/ /root/avocado/data/avocado-vt/images/
 RUN curl -s https://avocado-project.org/data/assets/jeos/27/jeos-27-64.qcow2.xz | xz -d > /var/lib/avocado/data/avocado-vt/images/jeos-27-x86_64.qcow2

diff --git a/contrib/containers/ci/rhel-8.docker b/contrib/containers/ci/rhel-8.docker
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/ubi
 LABEL description "RHEL 8 image used on integration checks, such as cirrus-ci"
-RUN dnf -y install git xz nc iproute iputils gcc python3-devel
+RUN dnf -y install git xz nc iproute iputils gcc
 RUN dnf -y clean all
 # Mock the additional requirements by touch&chmod, which is enough for --dry-run
 RUN for PROG in tcpdump qemu-kvm qemu-img qemu-io; do touch /usr/local/bin/$PROG; chmod +x /usr/local/bin/$PROG; done
diff --git a/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst
@@ -30,7 +30,7 @@ Pip is useful when it comes to python dependencies, but it fails
 in non-python ones. List of non-python requirements based on Fedora
 package names is::
 
-    $ dnf install xz tcpdump iproute iputils gcc glibc-headers nc git python-devel
+    $ dnf install xz tcpdump iproute iputils gcc glibc-headers nc git
 
 Then you can get Avocado-VT via pip::
 

diff --git a/docs/source/InstallOptionalPackages.rst b/docs/source/InstallOptionalPackages.rst
@@ -88,15 +88,6 @@ the basic purpose of building and cloning virtual machines.
 
     $ yum install virt-install
 
-To run all tests that involve filedescriptor passing, you need python-devel.
-The reason is, this test suite is compatible with python 2.4, whereas a
-std lib to pass filedescriptors was only introduced in python 3.2. Therefore,
-we had to introduce a C python extension that is compiled on demand.
-
-::
-
-    $ yum install python-devel
-
 
 It's useful to also install:
 

diff --git a/docs/source/RegressionTestFarm.rst b/docs/source/RegressionTestFarm.rst
@@ -297,7 +297,6 @@ with experience. Some notes:
     gdb
     iasl
     libvirt
-    python-devel
     ntpdate
     gstreamer-plugins-good
     gstreamer-python

diff --git a/virttest/bootstrap.py b/virttest/bootstrap.py
@@ -51,7 +51,7 @@
                                                                  'virt-manager',
                                                                  'virt-xml']}
 
-mandatory_headers = {'qemu': ['Python.h', 'types.h', 'socket.h', 'unistd.h'],
+mandatory_headers = {'qemu': [],
                      'spice': [],
                      'libvirt': [],
                      'openvswitch': [],

diff --git a/virttest/utils_test/__init__.py b/virttest/utils_test/__init__.py
@@ -942,7 +942,7 @@ def __init__(self, vm, params, test, testlist=[], timeout=3600,
         self.prerequisites = {'packages': ['git'],
                               'python': ['python', 'python-pip', 'python-devel'],
                               'python2': ['python2', 'python2-pip', 'python2-devel'],
-                              'python3': ['python3', 'python3-pip', 'python3-devel']}
+                              'python3': ['python3', 'python3-pip']}
         if self.avocado_vt:
             self.vt_type = self.params.get("vt_type", "qemu")
             self.vt_arch = self.params.get("vt_arch", "")