From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 92E2C1581B9 for ; Sat, 04 Oct 2025 14:10:12 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8045F3416C5 for ; Sat, 04 Oct 2025 14:10:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0126B11057C; Sat, 04 Oct 2025 14:09:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EE31A11057C for ; Sat, 04 Oct 2025 14:09: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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A65043412A5 for ; Sat, 04 Oct 2025 14:09:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 968823AB4 for ; Sat, 04 Oct 2025 14:09:48 +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: <1759586982.a53c1c08f30b54aa27f3a63b9ee26ad38cf7294e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/dulwich/files/, dev-python/dulwich/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/dulwich/dulwich-0.24.2.ebuild dev-python/dulwich/files/dulwich-0.24.2-test-path.patch X-VCS-Directories: dev-python/dulwich/files/ dev-python/dulwich/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a53c1c08f30b54aa27f3a63b9ee26ad38cf7294e X-VCS-Branch: master Date: Sat, 04 Oct 2025 14:09:48 +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: 5dbc91ef-c01c-4447-aa4d-b69db364d3bd X-Archives-Hash: cb9ef31e3a34691726bc84fad5065274 commit: a53c1c08f30b54aa27f3a63b9ee26ad38cf7294e Author: Michał Górny gentoo org> AuthorDate: Sat Oct 4 13:57:40 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Oct 4 14:09:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53c1c08 dev-python/dulwich: Enable py3.14 Signed-off-by: Michał Górny gentoo.org> dev-python/dulwich/dulwich-0.24.2.ebuild | 7 +++- .../dulwich/files/dulwich-0.24.2-test-path.patch | 49 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dev-python/dulwich/dulwich-0.24.2.ebuild b/dev-python/dulwich/dulwich-0.24.2.ebuild index fb5cccaa6c21..ec8abb78a190 100644 --- a/dev-python/dulwich/dulwich-0.24.2.ebuild +++ b/dev-python/dulwich/dulwich-0.24.2.ebuild @@ -6,7 +6,7 @@ EAPI=8 CARGO_OPTIONAL=1 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..13} ) +PYTHON_COMPAT=( python3_{11..14} ) CRATES=" autocfg@1.5.0 @@ -77,6 +77,11 @@ distutils_enable_sphinx docs QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so" +PATCHES=( + # https://github.com/jelmer/dulwich/pull/1906 + "${FILESDIR}/${P}-test-path.patch" +) + pkg_setup() { # avoid rust_pkg_setup which will die when there's no Rust found if use native-extensions ; then diff --git a/dev-python/dulwich/files/dulwich-0.24.2-test-path.patch b/dev-python/dulwich/files/dulwich-0.24.2-test-path.patch new file mode 100644 index 000000000000..63af9b5b2e09 --- /dev/null +++ b/dev-python/dulwich/files/dulwich-0.24.2-test-path.patch @@ -0,0 +1,49 @@ +From 1643810cec254c9c7d78614c4ffedb8ac7cc77c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 4 Oct 2025 15:52:07 +0200 +Subject: [PATCH] Fix BlackboxTestCase to respect Python venv path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix BlackboxTestCase to include `sysconfig.get_path("scripts")` +in binary paths, which corresponds to the binary directory used +in the current virtual environment. This ensures that the tests use +the correct dulwich executables rather than the (possibly older) version +installed to `/usr/bin`. + +The test previously attempted to reconstruct the `bin` path relatively +to the test file. However, that logic stopped working correctly when +tests were moved out of the package in +245331a60d743b7b73ba3a8b15e6f4648273369f. I suspect that the problem +may have went unnoticed for a time, since the tests are skipped when +the binaries can't be found. While it is technically possible to fix +the reconstruction logic to use the `dulwich` module path, using +`sysconfig` ensures we are using the correct path rather than guessing. + +Signed-off-by: Michał Górny +--- + tests/__init__.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index fb70aa5b32..d7cbf8a6ea 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -34,6 +34,7 @@ + import shutil + import subprocess + import sys ++import sysconfig + import tempfile + + # If Python itself provides an exception, use that +@@ -70,7 +71,7 @@ class BlackboxTestCase(TestCase): + + # TODO(jelmer): Include more possible binary paths. + bin_directories: ClassVar[list[str]] = [ +- os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "bin")), ++ sysconfig.get_path("scripts"), + "/usr/bin", + "/usr/local/bin", + ]