From 0e2a727aba684f1a44cc0402a3f77d242140681b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 30 May 2024 00:07:18 +0100 Subject: gentoo auto-resync : 30:05:2024 - 00:07:18 --- dev-python/paramiko/Manifest | 3 +- .../files/paramiko-3.4.0-pytest-fixes.patch | 34 ++++++++++++++++++++++ dev-python/paramiko/paramiko-3.4.0.ebuild | 5 ++-- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 dev-python/paramiko/files/paramiko-3.4.0-pytest-fixes.patch (limited to 'dev-python/paramiko') diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest index 931c34f9f5a0..5cee3623731b 100644 --- a/dev-python/paramiko/Manifest +++ b/dev-python/paramiko/Manifest @@ -1,5 +1,6 @@ AUX paramiko-3.2.0-disable-server.patch 1771 BLAKE2B 3cab494873956d6f36b8ea85903141a49eb515fd92851f041f91418dc58acc77cdaf00a215c8e681d037d78eabfc7718a5670f2ca6af02fe357daece9a48819e SHA512 9f2f85518dec8668d096fa1db77ec5219f14fb6127c29bbdc2ba47f55e3526e9f1dbca421adb18033a8358c0efac7db723536b26bd8f45c8583503fb4ae58d76 AUX paramiko-3.2.0-nih-test-deps.patch 4289 BLAKE2B 4a77852f0ae3cda52eca8844f4bf2571c17a0935088973f48c46abf250081845a870fb52d8ebafb108f634dbe86fbe784eefd49d9240c50f911d56173d1e3d71 SHA512 4e0bed394e4c8be19108cc0a7253d6306a698a3cc09b40c18459c8e16591ff42c41cb4f385fc05dcf902161fa23ce2b7d00c665784b9106344a5ca42e4f2a788 +AUX paramiko-3.4.0-pytest-fixes.patch 1082 BLAKE2B bf12d79158c9d21c2db43e1e6ea85a5f7d67c97a88f6a0fa76f7bca1a3bf49d59f63dccd278a21a8556465c09676b2941a2ebd07303bcd75141a1d42e5334694 SHA512 338f493ef9e920618acc9351cee5a81303d7ed9dbb98215f5b8621a5bddbea61ebffedcd09991fbc80163c1ecf53433a2e1b4c860b8a4d204eb8b2b039b3b484 DIST paramiko-3.4.0.gh.tar.gz 374441 BLAKE2B a6ea03d40e477cb02c1293c46025909251f8eec2be70638bf850638d9fe8c15bfe0e278697e41f3595f482b8f0755d911b905b11db2324eca597fc9be2a22f24 SHA512 f78fccf653d05acee78dfb76fb662c85fbfea7901fd94460a2d2e526c9b25169993051d20c16cfe0b7745008b1ea3a745fc9a280386d98a06689aaadf78f6752 -EBUILD paramiko-3.4.0.ebuild 1345 BLAKE2B 27c0531cd9cd5d79ee5f34af106e7e626251706344466f3afbfbe869e543b188e5c4469c4cc7e245faf1fdd693d1ddba2e303aeea2b73de044360a15db7ff622 SHA512 62d973550168ae3e4a675f546b40c657381cd61826c3d417e333ca9b34474c1b6e1402c4754e992ecc2e8df66772dfeeb8720c821f10ecc0eaa9a20a4a0125d5 +EBUILD paramiko-3.4.0.ebuild 1392 BLAKE2B ffbae7f8e32c8e27329da800215992573720217e079a2cfa43495f53c3fa65cdca33abecb6286a9bb537013ab263310499468b44702670c3d6b97b1775492f16 SHA512 dc50e59d8943e425cffc5f2fc878be9e840465c9a1d9d4aa34d1c6d41c64ae605c2f8d05a6c212771decfc9fad1f67f6d0055912ccd8f3186770e060cb9e426d MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583 diff --git a/dev-python/paramiko/files/paramiko-3.4.0-pytest-fixes.patch b/dev-python/paramiko/files/paramiko-3.4.0-pytest-fixes.patch new file mode 100644 index 000000000000..5d8eb3ffbb43 --- /dev/null +++ b/dev-python/paramiko/files/paramiko-3.4.0-pytest-fixes.patch @@ -0,0 +1,34 @@ +From 71dd9c098b800a358065070a44d2803b759f222a Mon Sep 17 00:00:00 2001 +From: marston +Date: Wed, 27 Sep 2023 21:04:25 -0400 +Subject: [PATCH] Fix deprecated nose tests and 'isSet()' + +Upstream-PR: https://github.com/paramiko/paramiko/pull/2306 +Upstream-Issue: https://github.com/paramiko/paramiko/issues/2290 + +diff --git a/tests/test_client.py b/tests/test_client.py +index 1c0c6c84b..feb27bbec 100644 +--- a/tests/test_client.py ++++ b/tests/test_client.py +@@ -689,7 +689,7 @@ def _setup_for_env(self): + ) + + self.event.wait(1.0) +- self.assertTrue(self.event.isSet()) ++ self.assertTrue(self.event.is_set()) + self.assertTrue(self.ts.is_active()) + + def test_update_environment(self): +diff --git a/tests/test_config.py b/tests/test_config.py +index 2e49aa3de..1e623e0ad 100644 +--- a/tests/test_config.py ++++ b/tests/test_config.py +@@ -53,7 +53,7 @@ def load_config(name): + + + class TestSSHConfig: +- def setup(self): ++ def setup_method(self): + self.config = load_config("robey") + + def test_init(self): diff --git a/dev-python/paramiko/paramiko-3.4.0.ebuild b/dev-python/paramiko/paramiko-3.4.0.ebuild index 0d9df530e354..595554941099 100644 --- a/dev-python/paramiko/paramiko-3.4.0.ebuild +++ b/dev-python/paramiko/paramiko-3.4.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) +PYTHON_COMPAT=( pypy3 python3_{10..13} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -44,6 +44,7 @@ EPYTEST_DESELECT=( src_prepare() { local PATCHES=( "${FILESDIR}/${PN}-3.2.0-nih-test-deps.patch" + "${FILESDIR}/${PN}-3.4.0-pytest-fixes.patch" ) if ! use server; then -- cgit v1.2.3