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 0DA541581D3 for ; Tue, 14 May 2024 15:58:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6D3EE29B1; Tue, 14 May 2024 15:58:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA065E29B6 for ; Tue, 14 May 2024 15:58:34 +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 ED319340813 for ; Tue, 14 May 2024 15:58:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8948B1AC8 for ; Tue, 14 May 2024 15:58:32 +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: <1715702308.42c8a9c6444e5fe26ba34a726351e9b38c90e267.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/setuptools/files/setuptools-69.5.1-py313.patch dev-python/setuptools/setuptools-69.5.1-r1.ebuild X-VCS-Directories: dev-python/setuptools/files/ dev-python/setuptools/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 42c8a9c6444e5fe26ba34a726351e9b38c90e267 X-VCS-Branch: master Date: Tue, 14 May 2024 15:58:32 +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: 16092147-37fb-4711-8f53-3861a6a87f45 X-Archives-Hash: d3766e1e7ccbc90d450c3af8c81d4576 commit: 42c8a9c6444e5fe26ba34a726351e9b38c90e267 Author: Michał Górny gentoo org> AuthorDate: Tue May 14 15:56:15 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue May 14 15:58:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c8a9c6 dev-python/setuptools: Enable testing on py3.13 Signed-off-by: Michał Górny gentoo.org> .../setuptools/files/setuptools-69.5.1-py313.patch | 30 ++++++++++++++++++++++ dev-python/setuptools/setuptools-69.5.1-r1.ebuild | 8 +++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dev-python/setuptools/files/setuptools-69.5.1-py313.patch b/dev-python/setuptools/files/setuptools-69.5.1-py313.patch new file mode 100644 index 000000000000..7222d3dba266 --- /dev/null +++ b/dev-python/setuptools/files/setuptools-69.5.1-py313.patch @@ -0,0 +1,30 @@ +From c6266e423fa26aafa01f1df71de7c6613273155e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Tue, 14 May 2024 16:24:07 +0200 +Subject: [PATCH] Make the validation test for entry-points work with Python + 3.13+ + +The exception in importlib.metadata has changed. +See https://github.com/python/importlib_metadata/issues/488 + +This makes an existing test pass with Python 3.13. + +Partially fixes https://github.com/pypa/setuptools/issues/4196 +--- + setuptools/_entry_points.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setuptools/_entry_points.py b/setuptools/_entry_points.py +index 747a69067e..b244e78387 100644 +--- a/setuptools/_entry_points.py ++++ b/setuptools/_entry_points.py +@@ -17,7 +17,8 @@ def ensure_valid(ep): + """ + try: + ep.extras +- except AttributeError as ex: ++ except (AttributeError, AssertionError) as ex: ++ # Why both? See https://github.com/python/importlib_metadata/issues/488 + msg = ( + f"Problems to parse {ep}.\nPlease ensure entry-point follows the spec: " + "https://packaging.python.org/en/latest/specifications/entry-points/" diff --git a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild index dec59bb85752..80af914ad532 100644 --- a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild +++ b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild @@ -7,7 +7,7 @@ EAPI=8 # please bump dev-python/ensurepip-setuptools along with this package! DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( python3_{10..12} pypy3 ) +PYTHON_TESTED=( python3_{10..13} pypy3 ) PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13 ) PYTHON_REQ_USE="xml(+)" @@ -42,7 +42,6 @@ BDEPEND=" test? ( $(python_gen_cond_dep ' dev-python/build[${PYTHON_USEDEP}] - dev-python/importlib-metadata[${PYTHON_USEDEP}] >=dev-python/ini2toml-0.9[${PYTHON_USEDEP}] >=dev-python/filelock-3.4.0[${PYTHON_USEDEP}] >=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}] @@ -70,7 +69,10 @@ PDEPEND=" src_prepare() { local PATCHES=( # TODO: remove this when we're 100% PEP517 mode - "${FILESDIR}"/setuptools-62.4.0-py-compile.patch + "${FILESDIR}/setuptools-62.4.0-py-compile.patch" + + # https://github.com/pypa/setuptools/pull/4357 + "${FILESDIR}/${P}-py313.patch" ) distutils-r1_src_prepare