gentoo auto-resync : 15:10:2024 - 04:04:09

3 files changed, 52 insertions, 3 deletions

diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 6a1d8750ffbc..e85a595aac8b 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1,4 @@
+AUX wheel-0.44.0-ft.patch 1111 BLAKE2B 48ea6f9705d747a2a020c4bd4b81dfaeff8a91c2b02bbd74578bcc65105397d60a9a51e3dd7e359b3dbb79468aef4b4c44a087ca5bf05e5a089213754cc9758f SHA512 7f792b55f55cf5559423e4a2e12527ffcdc14ef5438c10ef2e6590d05ee19303debb4e1d8ac28400dbcc457861273b3c0841895776e334d85b17a2f58728fb56
 DIST wheel-0.44.0.tar.gz 100733 BLAKE2B 6beefa0875be52fb2dff2921cb87063bcafdf2e31c43963676fbae8aef4e68ea21675aa715f94052edc9f5e8dbbd5e2afe3abc17f521eb36b24fa628b0522bbe SHA512 f0a1efbf70e8a2eebdf7564932bdfa3892940a3fbfc00f256f61be03a51ff9cc5a55570d1d3f5878670be84ab233483453ce754ea46c508574fcf4ec61d480c8
-EBUILD wheel-0.44.0.ebuild 1035 BLAKE2B 2326e0f266cfbbe6e488cb6144c8642564ad285388e4f8596eeef1bdcbf27e93f059d84f9c58b49284b9ffd42248b34fb03a3110820515291e818cf9263a8839 SHA512 b7b6a939a6a5c58bcaefe2d0b40d2f00cfb006598f646fc315b0d020e3382d608de6ce41a533de28cbb23483782c0b73f9ccbaee4afcd8c98372c836fec4826e
+EBUILD wheel-0.44.0.ebuild 1212 BLAKE2B d1831443a412f542c4e460daed90c9e2420211f50c4903cd9284fb4e5e0796577b8dae62d04937676d85a209a5dbdf922ccca4bd8ccfda563e945affdd842d4d SHA512 3b4e8644d188234e5772915171b0d6fe614287dbead15f0bd2336881188661c6fba12f132eaa4d1bc9af96606c05adca6e7a20643b445e0b61e0e3e246aa0666
 MISC metadata.xml 383 BLAKE2B 352e8b44b3c4f7008c6ac73b8d4454602785ea86ad52ba4601b1c598a0da4831ecdf1b36cfbeaaa1635e52a924a3317d6abff9dc1b26d3f77f04c681208265d3 SHA512 a810c2c7bdff95154a907ce2a00ed2ccc63174e0ba7dea21c6faf62624aac12c2f772557f4f26406693b8963d3bfa77b95dc9e4156493ee991d64021ad8f6c44
diff --git a/dev-python/wheel/files/wheel-0.44.0-ft.patch b/dev-python/wheel/files/wheel-0.44.0-ft.patch
new file mode 100644
index 000000000000..600318dc275e
--- /dev/null
+++ b/dev-python/wheel/files/wheel-0.44.0-ft.patch
@@ -0,0 +1,38 @@
+From d30f834fcec7ecdbb74e263789db2fbe9ff37e99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 11 Oct 2024 16:12:50 +0200
+Subject: [PATCH] Skip abi3 tests when freethreading Python build is used
+
+Skip the tests using abi3 extension when the freethreading build is
+used, as Python 3.13 freethreading does not support the limited API
+and its use results in a build error.
+
+Fixes #636
+---
+ tests/conftest.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 5ee84da..d5bd356 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -7,6 +7,7 @@ from __future__ import annotations
+ import os.path
+ import subprocess
+ import sys
++import sysconfig
+ 
+ import pytest
+ 
+@@ -22,7 +23,7 @@ def wheels_and_eggs(tmp_path_factory):
+         "unicode.dist",
+     )
+ 
+-    if sys.platform != "win32":
++    if sys.platform != "win32" and sysconfig.get_config_var("Py_GIL_DISABLED") != 1:
+         # ABI3 extensions don't really work on Windows
+         test_distributions += ("abi3extension.dist",)
+ 
+-- 
+2.47.0
+
diff --git a/dev-python/wheel/wheel-0.44.0.ebuild b/dev-python/wheel/wheel-0.44.0.ebuild
index effd34bd7d1a..aa0df30e0b2c 100644
--- a/dev-python/wheel/wheel-0.44.0.ebuild
+++ b/dev-python/wheel/wheel-0.44.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
 
 inherit distutils-r1 pypi
 
@@ -36,10 +36,20 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/pypa/wheel/pull/637
+		"${FILESDIR}/${P}-ft.patch"
+	)
+
+	distutils-r1_src_prepare
+
 	# unbundle packaging
 	rm -r src/wheel/vendored || die
 	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
 	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
+}
 
-	distutils-r1_src_prepare
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
 }