diff --git a/0004-remove-icecream-dep.patch b/0004-remove-icecream-dep.patch new file mode 100644 index 0000000000000000000000000000000000000000..b1385f3a97f9cd81b58adf78ca7c887f6acafb67 --- /dev/null +++ b/0004-remove-icecream-dep.patch @@ -0,0 +1,26 @@ +--- a/dev-requirements.txt ++++ b/dev-requirements.txt +@@ -17,7 +17,5 @@ coverage>=6.2,<7 + alabaster==0.7.13 + releases>=2.1 + watchdog<2 +-# Debuggery +-icecream>=2.1 + # Self (sans GSS which is a pain to bother with most of the time) + -e ".[invoke]" +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -22,13 +22,6 @@ from ._loop import LoopSocket + from ._stub_sftp import StubServer, StubSFTPServer + from ._util import _support + +-from icecream import ic, install as install_ic +- +- +-# Better print() for debugging - use ic()! +-install_ic() +-ic.configureOutput(includeContext=True) +- + + # Perform logging by default; pytest will capture and thus hide it normally, + # presenting it on error/failure. (But also allow turning it off when doing diff --git a/0005-remove-invoke-dep.patch b/0005-remove-invoke-dep.patch new file mode 100644 index 0000000000000000000000000000000000000000..4893f2766beb207f42a69ce74d5b8451a96f8b5c --- /dev/null +++ b/0005-remove-invoke-dep.patch @@ -0,0 +1,11 @@ +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -4,7 +4,7 @@ import shutil + import threading + from pathlib import Path + +-from invoke.vendor.lexicon import Lexicon ++from lexicon import Lexicon + + import pytest + from paramiko import ( diff --git a/paramiko-3.5.0.tar.gz b/paramiko-3.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..158917c15d3b6ad7a5bd6ab28382285ca65c36ca Binary files /dev/null and b/paramiko-3.5.0.tar.gz differ diff --git a/python-paramiko.spec b/python-paramiko.spec index 8551b8e38c72d1087ac204dad258ac22029ebcda..eaf5cf17e7f56d543a61006f04b7bf3fabcb6a52 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -1,15 +1,15 @@ -%define anolis_release 2 +%define anolis_release 1 %global srcname paramiko Name: python-paramiko -Version: 2.12.0 +Version: 3.5.0 Release: %{anolis_release}%{dist} Summary: SSH2 protocol library for python # No version specified License: LGPL-2.1-or-later URL: https://github.com/paramiko/paramiko -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Source0: https://github.com/paramiko/paramiko/archive/3.5.0/paramiko-3.5.0.tar.gz # Remove pytest-relaxed, which depends on pytest4 # Can be removed when https://github.com/paramiko/paramiko/pull/1665/ is released @@ -18,6 +18,8 @@ Patch3: 0003-remove-pytest-relaxed-dep.patch # Avoid use of deprecated python-mock by using unittest.mock instead # Can be removed when https://github.com/paramiko/paramiko/pull/1666/ is released Patch4: 0004-remove-mock-dep.patch +Patch5: 0004-remove-icecream-dep.patch +Patch6: 0005-remove-invoke-dep.patch BuildArch: noarch @@ -54,6 +56,11 @@ Python 3 version. %package doc Summary: Docs and demo for SSH2 protocol library for python BuildRequires: /usr/bin/sphinx-build +BuildRequires: python3-devel >= 3.6 +BuildRequires: python3dist(bcrypt) >= 3.2 +BuildRequires: python3dist(cryptography) >= 3.3 +BuildRequires: python3dist(lexicon) >= 2.0.1 +BuildRequires: python3dist(pynacl) >= 1.5 Requires: %{name} = %{version}-%{release} %description doc @@ -89,6 +96,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} %doc html/ demos/ %changelog +* Thu Dec 04 2025 wency_cn - 3.5.0-1 +- Updated to version 3.5.0 to fix xxxxxx +- Update import path to avoid dependency on internal vendored modules and ensure reliability + * Wed Mar 27 2024 Bo Ren - 2.12.0-2 - Rebuild with python3.11