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 0E03C158023 for ; Sat, 10 Dec 2022 08:57:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 580A9E0855; Sat, 10 Dec 2022 08:57:57 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3924CE0855 for ; Sat, 10 Dec 2022 08:57:57 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07EFD3411F0 for ; Sat, 10 Dec 2022 08:57:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DABF3A5 for ; Sat, 10 Dec 2022 08:57:54 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1670662668.6fd77322868db50f5b0b7f935bb2c771a1f3e9f7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/paramiko/files/, dev-python/paramiko/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/paramiko/Manifest dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch dev-python/paramiko/paramiko-2.11.0.ebuild X-VCS-Directories: dev-python/paramiko/files/ dev-python/paramiko/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6fd77322868db50f5b0b7f935bb2c771a1f3e9f7 X-VCS-Branch: master Date: Sat, 10 Dec 2022 08:57:54 +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: a9fc83c0-8106-442b-9df5-0e2b07180fdb X-Archives-Hash: ee94ef0201da6b8dba58daa6cb03885c commit: 6fd77322868db50f5b0b7f935bb2c771a1f3e9f7 Author: Michał Górny gentoo org> AuthorDate: Sat Dec 10 08:55:26 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 10 08:57:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd77322 dev-python/paramiko: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/paramiko/Manifest | 1 - .../files/paramiko-2.11.0-invoke-tests.patch | 40 --------- .../files/paramiko-2.11.0-pytest-relaxed.patch | 94 ---------------------- dev-python/paramiko/paramiko-2.11.0.ebuild | 62 -------------- 4 files changed, 197 deletions(-) diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest index eb655f12f935..aac53d250edf 100644 --- a/dev-python/paramiko/Manifest +++ b/dev-python/paramiko/Manifest @@ -1,2 +1 @@ -DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B 86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35 SHA512 59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5 DIST paramiko-2.12.0.gh.tar.gz 351956 BLAKE2B d41668f32f28a5c2c3af1d2b5c85bb4c3d2f5af9028cd5ebcb2b8aa21bc25df2c1ead5ddfe61ff12cfacec4b92913833e267f8a3fef07fa9a794f4b064fdb472 SHA512 1bf325ffd393447cb90009d01dc1104d0d43a6acdd08cc6d28310063a649a333323748800dab119ab5e10833975e68f5f5702044fc247a2e8058122a5327f2c7 diff --git a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch deleted file mode 100644 index 80fe876ef8e3..000000000000 --- a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 529558cc20e448e45e24dc7b7609cd62300838b8 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 45fb262d..017d4bbf 100644 ---- a/tests/test_config.py -+++ b/tests/test_config.py -@@ -6,7 +6,11 @@ from socket import gaierror - - 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 - -@@ -742,6 +746,7 @@ def _expect(success_on): - 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")) --- -2.35.1 - diff --git a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch deleted file mode 100644 index 6e746aff1863..000000000000 --- a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 03741e48c83856e53fc3f1487d660165cb718c11 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 17 May 2022 07:26:36 +0200 -Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises - -There is really no technical reason to bring pytest-relaxed to call -@raises as a decorator while plain pytest works just fine. Plus, -pytest.raises() is used in test_sftp already. - -pytest-relaxed causes humongous breakage to other packages -on the system. It has been banned from Gentoo for this reason. ---- - dev-requirements.txt | 1 - - pytest.ini | 3 --- - tests/test_client.py | 20 ++++++++++---------- - 3 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/dev-requirements.txt b/dev-requirements.txt -index 3ed9eb40..e90f3373 100644 ---- 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 -diff --git a/pytest.ini b/pytest.ini -index be207cd8..5a506bcd 100644 ---- 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. -diff --git a/tests/test_client.py b/tests/test_client.py -index fdf19c45..e4af71df 100644 ---- 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", -+ ) --- -2.35.1 - diff --git a/dev-python/paramiko/paramiko-2.11.0.ebuild b/dev-python/paramiko/paramiko-2.11.0.ebuild deleted file mode 100644 index 6576cc3aa7b1..000000000000 --- a/dev-python/paramiko/paramiko-2.11.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="SSH2 protocol library" -HOMEPAGE=" - https://www.paramiko.org/ - https://github.com/paramiko/paramiko/ - https://pypi.org/project/paramiko/ -" -SRC_URI=" - https://github.com/paramiko/paramiko/archive/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" -IUSE="examples server" - -RDEPEND=" - >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.5[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${PN}-2.11.0-pytest-relaxed.patch" - "${FILESDIR}/${PN}-2.11.0-invoke-tests.patch" - ) - - if ! use server; then - PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" ) - fi - distutils-r1_src_prepare -} - -python_install_all() { - distutils-r1_python_install_all - - if use examples; then - docinto examples - dodoc -r demos/* - fi -}