From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BD5A1581D3 for ; Tue, 28 May 2024 22:39:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E1B3E2A4F; Tue, 28 May 2024 22:39:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28D78E2A4F for ; Tue, 28 May 2024 22:39:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A217335D72 for ; Tue, 28 May 2024 22:39:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 817281610 for ; Tue, 28 May 2024 22:39:47 +0000 (UTC) From: "Petr Vaněk" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" Message-ID: <1716935893.b1e608faac2d815d4d38c8d65d24f830c52d59da.arkamar@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/, dev-python/paramiko/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/paramiko/files/paramiko-3.4.0-pytest-fixes.patch dev-python/paramiko/paramiko-3.4.0.ebuild X-VCS-Directories: dev-python/paramiko/ dev-python/paramiko/files/ X-VCS-Committer: arkamar X-VCS-Committer-Name: Petr Vaněk X-VCS-Revision: b1e608faac2d815d4d38c8d65d24f830c52d59da X-VCS-Branch: master Date: Tue, 28 May 2024 22:39:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 36f2bc27-517b-4094-9589-87b2844d810f X-Archives-Hash: 504c3d8bce8be682a4405270b2f08b34 commit: b1e608faac2d815d4d38c8d65d24f830c52d59da Author: Petr Vaněk gentoo org> AuthorDate: Tue May 28 22:03:28 2024 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Tue May 28 22:38:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e608fa dev-python/paramiko: fix tests with >=pytest-8.1 SSHConfig related tests are failing since pytest 8.1. The issue was already addressed in PR [1] in upstream, which is backported in this commit. [1] https://github.com/paramiko/paramiko/pull/2306 Signed-off-by: Petr Vaněk gentoo.org> .../files/paramiko-3.4.0-pytest-fixes.patch | 34 ++++++++++++++++++++++ dev-python/paramiko/paramiko-3.4.0.ebuild | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) 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..3ca6df11fc94 100644 --- a/dev-python/paramiko/paramiko-3.4.0.ebuild +++ b/dev-python/paramiko/paramiko-3.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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