diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-15 00:01:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-15 00:01:28 +0100 |
| commit | 514c44bb9cc421df9c323acbad430cbb6ee5b89a (patch) | |
| tree | 22621125c9bc9177d5339f093f57cb928531f33f /dev-python/setuptools | |
| parent | 59c2499e0c9720169c9d5a02168c51c807a21467 (diff) | |
gentoo auto-resync : 15:05:2024 - 00:01:27
Diffstat (limited to 'dev-python/setuptools')
| -rw-r--r-- | dev-python/setuptools/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/setuptools/files/setuptools-69.5.1-py313.patch | 30 | ||||
| -rw-r--r-- | dev-python/setuptools/setuptools-69.5.1-r1.ebuild | 10 |
3 files changed, 38 insertions, 5 deletions
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index cd06144dca7f..3dc3dd51bbdc 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,6 +1,7 @@ AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e +AUX setuptools-69.5.1-py313.patch 1170 BLAKE2B c94591a2c0c8e8b03ab7285934b42e85b9742ae69ffa48cf1ca4d23cb6b4f1ad0a9b8dc4b57ce80815f139edffe0e2339270be0b9880ea8dfaa0e739cdc0193a SHA512 dbda665f7d68c3f574e3d21d8fd946d2c6bda60cd2999ce83c58309dca5066f2e4294a441c4b56a9eeb80536cf76fd14141c443223c5b6cc5dd94c894b7d8645 DIST setuptools-69.0.3.tar.gz 2219609 BLAKE2B 1a5e7896c7ea82d51b0aa4794435b9899cef871f6ae43d22ae5e08c57d87b70641f3f2abfcc29956a3de515f90b112fd61d3daf793474b4cf33f8567e3a38f4a SHA512 11df934931f4b73f7e07ea5713479593c6baa134d423556b2ae7aff0f1e5bdbdee1f5b516131adb169c838231ceb0293441fbf275ef7030dabecf74122565b6d DIST setuptools-69.5.1.tar.gz 2291314 BLAKE2B 3756dd587136c7e688bdfecf4c0434c0e799f50f9a9a95750d41cb75e26b613b3dc178f43a9e0d21f17c42a7c4ad7461e7986966aefb814e3d0ff05178c82542 SHA512 81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a EBUILD setuptools-69.0.3-r1.ebuild 3942 BLAKE2B 7f198d6bf946f17df21143474c91c61be21ebde1c035f1dabdb78cf5308b978113bcb5f0d353ded961493ee8b0b9636f3354c6ac8fdc06bf16b75c2e12c32499 SHA512 170054320f5213dd0e9532836378415191796149bd6ea97824a4aad5019b5ee0e459b0a260aab176ae4cab8cc795d037ea29620d742f35b058d09e5ef5918136 -EBUILD setuptools-69.5.1-r1.ebuild 4578 BLAKE2B 7731d749b8a4a15234df021e84be05d3ec4d31635199961d5a0326d599a51eb5b56314992e0c8fe1ca4795fcf9e3adbb1c7448e8e4dd46799b66921ae154ecf7 SHA512 d417b4bfbfab66cc845a6e38a5297d8f3fa7ebbaa767e7ce3e4c9fc8323fdd775219bcc04e7b0cb1d3fc8e5e166ebbbfb3e03008abc66b1bc2f3c8d1089d2076 +EBUILD setuptools-69.5.1-r1.ebuild 4599 BLAKE2B 3a113c6de01f5bbf85cbab2b99106d67df61a8565da701b9eb36a40353421a99fbee48cdcc10c6a979e19f95cb8e952168b1651d90b958feb20c9f5a0a19a135 SHA512 c9c5e3c170f1c5af4031dd975c954403ff3c1589118172a73654b10b73375e30c497ac45aed8ff8415753c1c4ccbaba8f3cebe7e2f5c35deae422d19b1050c01 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319 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?= <miro@hroncok.cz> +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..548567ac52f4 100644 --- a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild +++ b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild @@ -7,8 +7,8 @@ EAPI=8 # please bump dev-python/ensurepip-setuptools along with this package! DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( python3_{10..12} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13 ) +PYTHON_TESTED=( python3_{10..13} pypy3 ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 pypi @@ -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 |