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 B4C65158086 for ; Sat, 27 Nov 2021 10:27:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6560E085B; Sat, 27 Nov 2021 10:27:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 447A8E085E for ; Sat, 27 Nov 2021 10:27:38 +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 3C637342EA6 for ; Sat, 27 Nov 2021 10:27:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76A451EA for ; Sat, 27 Nov 2021 10:27:35 +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: <1638008846.3c8b7b7f3b9952668ebc9aa50c009db2e641ae0f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/requests/files/requests-2.26.0-trustme-dep.patch dev-python/requests/requests-2.26.0.ebuild X-VCS-Directories: dev-python/requests/files/ dev-python/requests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3c8b7b7f3b9952668ebc9aa50c009db2e641ae0f X-VCS-Branch: master Date: Sat, 27 Nov 2021 10:27:35 +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: 3b54951b-54a2-4342-a66c-66b74fb8827a X-Archives-Hash: 1e404a97900e68a9ca683ec02d7a9a00 commit: 3c8b7b7f3b9952668ebc9aa50c009db2e641ae0f Author: Michał Górny gentoo org> AuthorDate: Sat Nov 27 09:58:12 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 27 10:27:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8b7b7f dev-python/requests: Support running tests without trustme In preperation for trustme losing keywords due to Rust requirement, make it possible to run the vast majority of requests' tests without it (only one test requires the dependency). Signed-off-by: Michał Górny gentoo.org> .../files/requests-2.26.0-trustme-dep.patch | 37 ++++++++++++++++++++++ dev-python/requests/requests-2.26.0.ebuild | 5 +-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch new file mode 100644 index 000000000000..b3a81659a9be --- /dev/null +++ b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch @@ -0,0 +1,37 @@ +From 6a1b5cbc124e0c3362ddefae5939db5c216a74db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 27 Nov 2021 10:33:35 +0100 +Subject: [PATCH] Skip the test requiring trustme when it is not available + +Modify the nosan_server fixture to cause test_https_warnings to be +skipped when trustme is not installed on the system, rather than causing +the whole test suite to fail unconditionally. This makes it possible +to run all the remaining tests on systems where trustme cannot be +installed due to its dependencies. +--- + tests/conftest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 099462cf..5d38f254 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -13,7 +13,6 @@ import threading + + import pytest + from requests.compat import urljoin +-import trustme + + + def prepare_url(value): +@@ -38,6 +37,7 @@ def httpbin_secure(httpbin_secure): + + @pytest.fixture + def nosan_server(tmp_path_factory): ++ trustme = pytest.importorskip('trustme') + tmpdir = tmp_path_factory.mktemp("certs") + ca = trustme.CA() + # only commonName, no subjectAltName +-- +2.34.1 + diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild index 911ddfa1be0d..d30d1f190284 100644 --- a/dev-python/requests/requests-2.26.0.ebuild +++ b/dev-python/requests/requests-2.26.0.ebuild @@ -39,10 +39,11 @@ distutils_enable_tests pytest PATCHES=( "${FILESDIR}"/${P}-test.patch + "${FILESDIR}"/${P}-trustme-dep.patch ) python_test() { - local deselect=( + local EPYTEST_DESELECT=( # Internet requests/__init__.py::requests requests/api.py::requests.api.request @@ -55,5 +56,5 @@ python_test() { tests/test_requests.py::TestRequests::test_pyopenssl_redirect ) - epytest ${deselect[@]/#/--deselect } + epytest }