diff --git a/0003-remove-pytest-relaxed-dep.patch b/0003-remove-pytest-relaxed-dep.patch deleted file mode 100644 index b66a58a773dc89715e7302c03e747c1b28687710..0000000000000000000000000000000000000000 --- a/0003-remove-pytest-relaxed-dep.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/dev-requirements.txt -+++ b/dev-requirements.txt -@@ -2,7 +2,6 @@ - invoke==1.6.0 - invocations==2.6.0 - pytest==4.4.2 --pytest-relaxed==1.1.5 - # pytest-xdist for test dir watching and the inv guard task - pytest-xdist==1.28.0 - mock==2.0.0 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,7 +1,4 @@ - [pytest] --# We use pytest-relaxed just for its utils at the moment, so disable it at the --# plugin level until we adapt test organization to really use it. --addopts = -p no:relaxed - # Loop on failure - looponfailroots = tests paramiko - # Ignore some warnings we cannot easily handle. ---- a/tests/test_client.py -+++ b/tests/test_client.py -@@ -33,7 +33,7 @@ import warnings - import weakref - from tempfile import mkstemp - --from pytest_relaxed import raises -+import pytest - from mock import patch, Mock - - import paramiko -@@ -733,11 +733,11 @@ class PasswordPassphraseTests(ClientTest - - # TODO: more granular exception pending #387; should be signaling "no auth - # methods available" because no key and no password -- @raises(SSHException) - @requires_sha1_signing - def test_passphrase_kwarg_not_used_for_password_auth(self): -- # Using the "right" password in the "wrong" field shouldn't work. -- self._test_connection(passphrase="pygmalion") -+ with pytest.raises(SSHException): -+ # Using the "right" password in the "wrong" field shouldn't work. -+ self._test_connection(passphrase="pygmalion") - - @requires_sha1_signing - def test_passphrase_kwarg_used_for_key_passphrase(self): -@@ -757,15 +757,15 @@ class PasswordPassphraseTests(ClientTest - password="television", - ) - -- @raises(AuthenticationException) # TODO: more granular - @requires_sha1_signing - def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa - self - ): - # Sanity: if we're given both fields, the password field is NOT used as - # a passphrase. -- self._test_connection( -- key_filename=_support("test_rsa_password.key"), -- password="television", -- passphrase="wat? lol no", -- ) -+ with pytest.raises(AuthenticationException): -+ self._test_connection( -+ key_filename=_support("test_rsa_password.key"), -+ password="television", -+ passphrase="wat? lol no", -+ ) diff --git a/Remove-icecream-dep.patch b/Remove-icecream-dep.patch new file mode 100644 index 0000000000000000000000000000000000000000..b1385f3a97f9cd81b58adf78ca7c887f6acafb67 --- /dev/null +++ b/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/backport-Skip-tests-requiring-invoke.patch b/backport-Skip-tests-requiring-invoke.patch deleted file mode 100644 index 3499e8d3b7b713378b0ecf88c8beda9dbd92122a..0000000000000000000000000000000000000000 --- a/backport-Skip-tests-requiring-invoke.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2dc654a20c4f1908d587060809a9d67b31352497 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Thu, 16 Apr 2020 09:46:39 +0200 -Subject: [PATCH] Skip tests requiring invoke if it's not installed - -Since invoke is an optional dependency and only one group of tests -require it, skip them gracefully rather than failing if it's not -present. ---- - tests/test_config.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tests/test_config.py b/tests/test_config.py -index 5e9aa0592..2095061f2 100644 ---- a/tests/test_config.py -+++ b/tests/test_config.py -@@ -6,7 +6,11 @@ - - from paramiko.py3compat import string_types - --from invoke import Result -+try: -+ from invoke import Result -+except ImportError: -+ Result = None -+ - from mock import patch - from pytest import raises, mark, fixture - -@@ -705,6 +709,7 @@ def inner(command, *args, **kwargs): - return inner - - -+@mark.skipif(Result is None, reason="requires invoke package") - class TestMatchExec(object): - @patch("paramiko.config.invoke", new=None) - @patch("paramiko.config.invoke_import_error", new=ImportError("meh")) diff --git a/paramiko-2.11.0.tar.gz b/paramiko-2.11.0.tar.gz deleted file mode 100644 index f9a3aac5e784c159790147a2f3ecf9aa3a42d239..0000000000000000000000000000000000000000 Binary files a/paramiko-2.11.0.tar.gz and /dev/null differ diff --git a/paramiko-3.2.0.tar.gz b/paramiko-3.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f36b3c685d2c26b411010c39100aa30212688442 Binary files /dev/null and b/paramiko-3.2.0.tar.gz differ diff --git a/python-paramiko.spec b/python-paramiko.spec index 68c4c94a62f048734261b5d92484ff4f416385c5..60bdbc76119422af4df6278fd45a8c74520a0e52 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -1,15 +1,12 @@ Name: python-paramiko -Version: 2.11.0 +Version: 3.2.0 Release: 1 Summary: Python SSH module License: LGPLv2+ URL: https://github.com/paramiko/paramiko Source0: https://github.com/paramiko/paramiko/archive/%{version}/paramiko-%{version}.tar.gz -# Skip tests requiring invoke if it's not installed -# Can be removed when https://github.com/paramiko/paramiko/pull/1667/ is released -Patch6000: backport-Skip-tests-requiring-invoke.patch -Patch6001: 0003-remove-pytest-relaxed-dep.patch +Patch0: Remove-icecream-dep.patch BuildArch: noarch @@ -23,6 +20,7 @@ Summary: Python SSH module BuildRequires: python3-devel python3-setuptools python3-bcrypt >= 3.1.3 python3-pytest BuildRequires: python3-cryptography >= 2.5 python3-pyasn1 >= 0.1.7 python3-pynacl >= 1.0.1 BuildRequires: python3-mock >= 2.0 +BuildRequires: python3-lexicon >= 2.0.1 python3-invoke python3-pytest-relaxed Requires: python3-bcrypt >= 3.1.3 python3-cryptography >= 1.5 Requires: python3-pyasn1 >= 0.1.7 python3-pynacl >= 1.0.1 %{?python_provide:%python_provide python3-paramiko} @@ -57,7 +55,6 @@ sphinx-build -b html sites/docs/ html/ rm -f html/.buildinfo %check -rm -f tests/test_sftp*.py PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} %files -n python3-paramiko @@ -69,6 +66,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} %doc html/ demos/ NEWS README.rst %changelog +* Thu Jun 15 2023 yaoxin - 3.2.0-1 +- Update to 3.2.0 + * Thu Jun 23 2022 houyingchao - 2.11.0-1 - Upgrade to version 2.11.0