Merge commit PRs #713, #714, #715, #716 and #718 into devel

webknjaz · webknjaz · commit b5e2404778f4 · 2025-05-08T03:44:51.000+02:00
diff --git a/.github/workflows/build-manylinux-container-images.yml b/.github/workflows/build-manylinux-container-images.yml
@@ -86,11 +86,17 @@ jobs:
         Set up QEMU ${{ env.QEMU_ARCH }} arch emulation
         with Podman
       if: env.QEMU_ARCH != 'amd64'
-      run: >-
+      run: >
+        sudo podman run
+        --rm --privileged
+        tonistiigi/binfmt
+        --uninstall 'qemu-*'
+
+
         sudo podman run
         --rm --privileged
-        multiarch/qemu-user-static
-        --reset -p yes
+        tonistiigi/binfmt
+        --install all
     - name: Build the image with Buildah
       id: build-image
       uses: redhat-actions/buildah-build@v2.13
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -767,7 +767,6 @@ jobs:
         - >-
           3.10
         - 3.9
-        - 3.8
         runner-vm-os:
         - ubuntu-22.04
         store-sdist-to-artifact:
@@ -965,6 +964,8 @@ jobs:
         target-container:
         - tag: fedora:39
         - tag: fedora:40
+        - tag: fedora:41
+        - tag: fedora:42
         # No matching package to install: 'python3dist(wheel)'
         # - tag: centos/centos:stream9
         #   registry: quay.io
@@ -1013,17 +1014,6 @@ jobs:
         dist_tag=$(rpm --eval '%{?dist}')
         echo "dist-tag=${dist_tag}" >> "${GITHUB_OUTPUT}"
 
-    - name: Patch CentOS Stream 8 repository URLs
-      if: >-
-        matrix.target-container.tag == 'centos/centos:stream8'
-      run: >-
-        sed -i
-        -e 's/mirrorlist/#mirrorlist/g'
-        -e
-        's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g'
-        /etc/yum.repos.d/CentOS-*
-      shell: bash -eEuo pipefail {0}
-
     - name: Enable EPEL repository
       if: contains(matrix.target-container.tag, 'centos')
       run: dnf install --assumeyes epel-release
@@ -1240,7 +1230,6 @@ jobs:
         - "3.11"
         - "3.10"
         - 3.9
-        - 3.8
         runner-vm-os:
         - ubuntu-24.04
         - ubuntu-22.04
@@ -1277,7 +1266,6 @@ jobs:
         - "3.11"
         - "3.10"
         - 3.9
-        - 3.8
         runner-vm-os:
         - macos-13
         dist-type:
diff --git a/README.rst b/README.rst
@@ -53,7 +53,7 @@ The web view is @ https://ansible.github.io/pylibssh/.
 Requirements
 ------------
 
-You need Python 3.8+
+You need Python 3.9+
 
 pylibssh requires libssh to be installed in particular:
 
diff --git a/build-scripts/manylinux-container-image/install-userspace-tools.sh b/build-scripts/manylinux-container-image/install-userspace-tools.sh
@@ -11,11 +11,13 @@ PYTHON_INTERPRETER=/opt/python/cp39-cp39/bin/python
 VIRTUALENV_PYTHON_BIN="${USERSPACE_VENV_BIN_PATH}/python"
 VIRTUALENV_PIP_BIN="${VIRTUALENV_PYTHON_BIN} -m pip"
 
-TOOLS_PKGS=auditwheel
-if [ "${ARCH}" == "x86_64" ]
-then
-    TOOLS_PKGS="${TOOLS_PKGS} cmake --only-binary=cmake"
-fi
+# NOTE: Cmake removed compatibility with `cmake < 3.5` that
+# NOTE: libssh 0.9.6 is set up to require.
+# NOTE: So this patch limits the version of `cmake` we install.
+#
+# Ref: https://github.com/eclipse-ecal/ecal/issues/2041
+# FIXME: Drop the restriction once libssh is bumped to v0.11 series.
+TOOLS_PKGS="auditwheel cmake<4 --only-binary=cmake"
 
 # Avoid creation of __pycache__/*.py[c|o]
 export PYTHONDONTWRITEBYTECODE=1
diff --git a/docs/changelog-fragments/532.breaking.rst b/docs/changelog-fragments/532.breaking.rst
@@ -1,2 +1,2 @@
-Dropped support for Python 3.6 and Python 3.7
+Dropped support for Python 3.6, 3.7 and 3.8
 -- by :user:`Qalthos` and :user:`webknjaz`.
diff --git a/docs/changelog-fragments/713.contrib.rst b/docs/changelog-fragments/713.contrib.rst
@@ -0,0 +1,5 @@
+The ``multiarch/qemu-user-static`` image got replaced with
+``tonistiigi/binfmt`` because the latter is no longer
+maintained and the former includes the fixed version of QEMU.
+
+-- by :user:`webknjaz`
diff --git a/docs/changelog-fragments/713.packaging.rst b/docs/changelog-fragments/713.packaging.rst
@@ -0,0 +1,2 @@
+The ``manylinux`` build scripts now limit ``cmake`` below
+version 4 -- by :user:`webknjaz`.
diff --git a/docs/changelog-fragments/714.packaging.rst b/docs/changelog-fragments/714.packaging.rst
@@ -0,0 +1 @@
+Stopped skipping SCP tests in the RPM spec -- by :user:`Jakuje`.
diff --git a/docs/changelog-fragments/715.contrib.rst b/docs/changelog-fragments/715.contrib.rst
@@ -0,0 +1 @@
+Added Fedora 41 and 42 to CI configuration -- by :user:`Jakuje`.
diff --git a/docs/changelog-fragments/716.contrib.rst b/docs/changelog-fragments/716.contrib.rst
@@ -0,0 +1 @@
+Removed needless step from CI adjusting centos8 repositories -- by :user:`Jakuje`.
diff --git a/docs/changelog-fragments/718.breaking.rst b/docs/changelog-fragments/718.breaking.rst
@@ -0,0 +1 @@
+532.breaking.rst
diff --git a/docs/installation_guide.rst b/docs/installation_guide.rst
@@ -25,7 +25,7 @@ CPython and OS versions so in 99% of cases, you may
 seamlessly install |project| not needing any external
 dependencies on your system.
 
-It should be enough for you to just have Python 3.8+ and
+It should be enough for you to just have Python 3.9+ and
 a recent :std:doc:`pip <pip:index>` installed.
 
 .. attention::
diff --git a/packaging/rpm/ansible-pylibssh.spec b/packaging/rpm/ansible-pylibssh.spec
@@ -230,17 +230,12 @@ export PYTHONPATH="%{buildroot_site_packages}:${PYTHONPATH}"
 # Fedora:
 %if "%{?fedora:SET}" == "SET"
 %pyproject_check_import
-%tox -e just-pytest -- \
-  -- \
-  --deselect tests/unit/scp_test.py::test_get \
-  --deselect tests/unit/scp_test.py::test_put
+%tox -e just-pytest
 # CentOS or RHEL:
 %else
 export PYTHONPATH="$(pwd)/bin:${PYTHONPATH}"
 %{__python3} -m pytest \
-  --no-cov \
-  --deselect tests/unit/scp_test.py::test_get \
-  --deselect tests/unit/scp_test.py::test_put
+  --no-cov
 %endif
 
 
diff --git a/setup.cfg b/setup.cfg
@@ -29,7 +29,6 @@ classifiers =
   Operating System :: POSIX :: Linux
 
   Programming Language :: Python :: 3
-  Programming Language :: Python :: 3.8
   Programming Language :: Python :: 3.9
   Programming Language :: Python :: 3.10
   Programming Language :: Python :: 3.11
@@ -44,7 +43,7 @@ keywords =
   libssh
 
 [options]
-python_requires = >=3.8
+python_requires = >= 3.9
 # Ref:
 # https://setuptools.readthedocs.io/en/latest/setuptools.html#using-a-src-layout
 # (`src/` layout)
diff --git a/src/pylibsshext/channel.pyx b/src/pylibsshext/channel.pyx
@@ -211,7 +211,7 @@ cdef class Channel:
         if not isinstance(sig, signal.Signals):
             raise TypeError(f"Expecting signal.Signals not {type(sig)}")
 
-        sshsig = sig.name.replace("SIG", "")  # FIXME: replace w/ `str.removeprefix()` once Python 3.8 support is dropped
+        sshsig = sig.name.removeprefix("SIG")
         rc = libssh.ssh_channel_request_send_signal(self._libssh_channel, sshsig.encode("utf-8"))
         if rc != libssh.SSH_OK:
             raise LibsshChannelException("Failed to ssh_channel_request_send_signal: [%d]" % rc)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Dropped support for Python 3.6 and Python 3.7`
	`1`	`+Dropped support for Python 3.6, 3.7 and 3.8`
`2`	`2`	-- by :user:`Qalthos` and :user:`webknjaz`.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+The ``manylinux`` build scripts now limit ``cmake`` below
	`2`	+version 4 -- by :user:`webknjaz`.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Stopped skipping SCP tests in the RPM spec -- by :user:`Jakuje`.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Added Fedora 41 and 42 to CI configuration -- by :user:`Jakuje`.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Removed needless step from CI adjusting centos8 repositories -- by :user:`Jakuje`.