Skip to content

Commit b5e2404

Browse files
committed
Merge commit PRs #713, #714, #715, #716 and #718 into devel
6 parents 90c6590 + ecace77 + 41d10aa + e527123 + 59ad9b1 + 7193d34 commit b5e2404

15 files changed

+36
-35
lines changed

.github/workflows/build-manylinux-container-images.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,17 @@ jobs:
8686
Set up QEMU ${{ env.QEMU_ARCH }} arch emulation
8787
with Podman
8888
if: env.QEMU_ARCH != 'amd64'
89-
run: >-
89+
run: >
90+
sudo podman run
91+
--rm --privileged
92+
tonistiigi/binfmt
93+
--uninstall 'qemu-*'
94+
95+
9096
sudo podman run
9197
--rm --privileged
92-
multiarch/qemu-user-static
93-
--reset -p yes
98+
tonistiigi/binfmt
99+
--install all
94100
- name: Build the image with Buildah
95101
id: build-image
96102
uses: redhat-actions/[email protected]

.github/workflows/ci-cd.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,6 @@ jobs:
767767
- >-
768768
3.10
769769
- 3.9
770-
- 3.8
771770
runner-vm-os:
772771
- ubuntu-22.04
773772
store-sdist-to-artifact:
@@ -965,6 +964,8 @@ jobs:
965964
target-container:
966965
- tag: fedora:39
967966
- tag: fedora:40
967+
- tag: fedora:41
968+
- tag: fedora:42
968969
# No matching package to install: 'python3dist(wheel)'
969970
# - tag: centos/centos:stream9
970971
# registry: quay.io
@@ -1013,17 +1014,6 @@ jobs:
10131014
dist_tag=$(rpm --eval '%{?dist}')
10141015
echo "dist-tag=${dist_tag}" >> "${GITHUB_OUTPUT}"
10151016
1016-
- name: Patch CentOS Stream 8 repository URLs
1017-
if: >-
1018-
matrix.target-container.tag == 'centos/centos:stream8'
1019-
run: >-
1020-
sed -i
1021-
-e 's/mirrorlist/#mirrorlist/g'
1022-
-e
1023-
's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g'
1024-
/etc/yum.repos.d/CentOS-*
1025-
shell: bash -eEuo pipefail {0}
1026-
10271017
- name: Enable EPEL repository
10281018
if: contains(matrix.target-container.tag, 'centos')
10291019
run: dnf install --assumeyes epel-release
@@ -1240,7 +1230,6 @@ jobs:
12401230
- "3.11"
12411231
- "3.10"
12421232
- 3.9
1243-
- 3.8
12441233
runner-vm-os:
12451234
- ubuntu-24.04
12461235
- ubuntu-22.04
@@ -1277,7 +1266,6 @@ jobs:
12771266
- "3.11"
12781267
- "3.10"
12791268
- 3.9
1280-
- 3.8
12811269
runner-vm-os:
12821270
- macos-13
12831271
dist-type:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The web view is @ https://ansible.github.io/pylibssh/.
5353
Requirements
5454
------------
5555

56-
You need Python 3.8+
56+
You need Python 3.9+
5757

5858
pylibssh requires libssh to be installed in particular:
5959

build-scripts/manylinux-container-image/install-userspace-tools.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ PYTHON_INTERPRETER=/opt/python/cp39-cp39/bin/python
1111
VIRTUALENV_PYTHON_BIN="${USERSPACE_VENV_BIN_PATH}/python"
1212
VIRTUALENV_PIP_BIN="${VIRTUALENV_PYTHON_BIN} -m pip"
1313

14-
TOOLS_PKGS=auditwheel
15-
if [ "${ARCH}" == "x86_64" ]
16-
then
17-
TOOLS_PKGS="${TOOLS_PKGS} cmake --only-binary=cmake"
18-
fi
14+
# NOTE: Cmake removed compatibility with `cmake < 3.5` that
15+
# NOTE: libssh 0.9.6 is set up to require.
16+
# NOTE: So this patch limits the version of `cmake` we install.
17+
#
18+
# Ref: https://github.com/eclipse-ecal/ecal/issues/2041
19+
# FIXME: Drop the restriction once libssh is bumped to v0.11 series.
20+
TOOLS_PKGS="auditwheel cmake<4 --only-binary=cmake"
1921

2022
# Avoid creation of __pycache__/*.py[c|o]
2123
export PYTHONDONTWRITEBYTECODE=1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
22
-- by :user:`Qalthos` and :user:`webknjaz`.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The ``multiarch/qemu-user-static`` image got replaced with
2+
``tonistiigi/binfmt`` because the latter is no longer
3+
maintained and the former includes the fixed version of QEMU.
4+
5+
-- by :user:`webknjaz`
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The ``manylinux`` build scripts now limit ``cmake`` below
2+
version 4 -- by :user:`webknjaz`.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Stopped skipping SCP tests in the RPM spec -- by :user:`Jakuje`.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added Fedora 41 and 42 to CI configuration -- by :user:`Jakuje`.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed needless step from CI adjusting centos8 repositories -- by :user:`Jakuje`.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
532.breaking.rst

docs/installation_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CPython and OS versions so in 99% of cases, you may
2525
seamlessly install |project| not needing any external
2626
dependencies on your system.
2727

28-
It should be enough for you to just have Python 3.8+ and
28+
It should be enough for you to just have Python 3.9+ and
2929
a recent :std:doc:`pip <pip:index>` installed.
3030

3131
.. attention::

packaging/rpm/ansible-pylibssh.spec

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,17 +230,12 @@ export PYTHONPATH="%{buildroot_site_packages}:${PYTHONPATH}"
230230
# Fedora:
231231
%if "%{?fedora:SET}" == "SET"
232232
%pyproject_check_import
233-
%tox -e just-pytest -- \
234-
-- \
235-
--deselect tests/unit/scp_test.py::test_get \
236-
--deselect tests/unit/scp_test.py::test_put
233+
%tox -e just-pytest
237234
# CentOS or RHEL:
238235
%else
239236
export PYTHONPATH="$(pwd)/bin:${PYTHONPATH}"
240237
%{__python3} -m pytest \
241-
--no-cov \
242-
--deselect tests/unit/scp_test.py::test_get \
243-
--deselect tests/unit/scp_test.py::test_put
238+
--no-cov
244239
%endif
245240

246241

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ classifiers =
2929
Operating System :: POSIX :: Linux
3030

3131
Programming Language :: Python :: 3
32-
Programming Language :: Python :: 3.8
3332
Programming Language :: Python :: 3.9
3433
Programming Language :: Python :: 3.10
3534
Programming Language :: Python :: 3.11
@@ -44,7 +43,7 @@ keywords =
4443
libssh
4544

4645
[options]
47-
python_requires = >=3.8
46+
python_requires = >= 3.9
4847
# Ref:
4948
# https://setuptools.readthedocs.io/en/latest/setuptools.html#using-a-src-layout
5049
# (`src/` layout)

src/pylibsshext/channel.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ cdef class Channel:
211211
if not isinstance(sig, signal.Signals):
212212
raise TypeError(f"Expecting signal.Signals not {type(sig)}")
213213

214-
sshsig = sig.name.replace("SIG", "") # FIXME: replace w/ `str.removeprefix()` once Python 3.8 support is dropped
214+
sshsig = sig.name.removeprefix("SIG")
215215
rc = libssh.ssh_channel_request_send_signal(self._libssh_channel, sshsig.encode("utf-8"))
216216
if rc != libssh.SSH_OK:
217217
raise LibsshChannelException("Failed to ssh_channel_request_send_signal: [%d]" % rc)

0 commit comments

Comments
 (0)