gentoo auto-resync : 10:10:2024 - 04:03:57

3 files changed, 84 insertions, 3 deletions

diff --git a/dev-python/multiprocess/Manifest b/dev-python/multiprocess/Manifest
index 596415ac44c1..d37215574852 100644
--- a/dev-python/multiprocess/Manifest
+++ b/dev-python/multiprocess/Manifest
@@ -1,5 +1,6 @@
+AUX multiprocess-0.70.17-wheel-tag.patch 2068 BLAKE2B f4e5a71b56053f1bc7f07a0deb58bd23af8e22d6bb76d7e63618e138df350905e594208cf291605f119918545a0b6d8568bc42001e9626ad000a308650e03bba SHA512 8175f1a5ae827ef1afca84550069334bad7c131b7c7034800ff3f4567d5d3036d90176fe8047643a86eecbe9adecd483cbd226adb2bbba4d03bea806e42ee83c
 DIST multiprocess-0.70.16.tar.gz 1772603 BLAKE2B e5d685e3c1343196560175b6b498e7c2758f035d67d0f40c2ab0ef587858d81662ae3242431c4f4fe258a421aa1646e5c76182e0ba3039be2b0ba16b2e23dcec SHA512 8aee5f0cf74ef4a30bcf2337a651a39270f507f9e827647ad3ae50cba688d2920c56331568b8d597b379587c3cb82f5d10d7b96bdba63a0eccc2ec7abccf9863
 DIST multiprocess-0.70.17.tar.gz 1785744 BLAKE2B 5840ff2239c720df571c6fc21e27a6ca193d2a24a4427c6c89dc17b523340293f5969ac3e8f7a5401a602064fbe204bc57d6ddafa2caa337cd06001d3c7ec910 SHA512 7fbc62d793548a58fcfe14dce333c46a75b177180ed402fec3b18bad24f53e965235466ddedc1d7a6551fb79689f97b272e36c1510352e278581f9a08ead09a4
 EBUILD multiprocess-0.70.16.ebuild 566 BLAKE2B bcf0a518760653e35416556737fa7a91148c08690b70468d754939634990bdaf37c6c43fb3c7f9c8305690fe65e588a232db707be3aaa86391fb634e4dc325e3 SHA512 940021d5f891623e6eba1bb0db22ae2469a4fcfe3952dc9501fb9241b3c0a98b6124bc40c6f73b825e3e4997529968701173b1c3a22ef5952243f8ab9216bec8
-EBUILD multiprocess-0.70.17.ebuild 665 BLAKE2B 7f5e2ec0e790e7d1fd45bcef9b64dc6f437ffd24d65f7db5957fc939aaff5d6a722074ee9e19a19eeb091241f0ad46a572f1d00366626f7f11b3fccfe0cf7b19 SHA512 cb0fb5f3d57ceb518cfd9db6e3ccb1dfe2bf0ae7de09abe048a551dbff85a82b0267406f11881ac9c0835383a1b0f11d81d5a8b19f0740ac09c7cdb420f286fc
+EBUILD multiprocess-0.70.17-r1.ebuild 960 BLAKE2B d1745b0e7184db526787320c2078697d97ccbb7a785c28c494fb50baca0d9b6405e42c540176fc0ffe7faecf1f0b7a3e758f33f6355424d984879b0477e79e69 SHA512 5a0556a6c1d8b569bd7b778439209a99244fbf0622c5d4a6a3f65509c1d440054f6e6a2f3e18cbb899b7de2b5593d8e7b1ab5eea74fd309abb33925bc4a6acc6
 MISC metadata.xml 388 BLAKE2B 90682f15ba194a74837ddf6a209ded65ab8207870d2976c3569cf4f0c4405163cbe7b25b1e0a662963f4ca890c96f7f29a65922e6b7a1cfd06422e8b7a304cd9 SHA512 4b77d39c7ec184288ef0ba90dbc889d29a4ce0bd37c9f9e66a43b8baa3f3ecd56cf122653d8931c3203226a83b8f7d495cdd63923421941eba6bd7d1ce0dc3ff
diff --git a/dev-python/multiprocess/files/multiprocess-0.70.17-wheel-tag.patch b/dev-python/multiprocess/files/multiprocess-0.70.17-wheel-tag.patch
new file mode 100644
index 000000000000..5f834c829af5
--- /dev/null
+++ b/dev-python/multiprocess/files/multiprocess-0.70.17-wheel-tag.patch
@@ -0,0 +1,65 @@
+From 6008b92ab778f845b8425f215e0e78d4238b7693 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 9 Oct 2024 09:47:07 +0200
+Subject: [PATCH] enforce correct python tags for pure wheels from setup.py
+
+Enforce correct python tags for pure Python wheels directly from
+`setup.py`.  This should be more reliable than the current approach.
+While at it, switch to correct tags for each platforms -- CPython
+uses "cp" (which unlike "py" is not accepted for PyPy), and PyPy can use
+pure "pp" without platform specifiers (since no extensions are
+installed).
+
+Fixes #196
+---
+ pyproject.toml |  1 +
+ setup.py       | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 5d64e77..38dd6b7 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,6 +1,7 @@
+ [build-system]
+ # Further build requirements come from setup.py via the PEP 517 interface
+ requires = [
++    "packaging",
+     "setuptools>=42",
+ ]
+ build-backend = "setuptools.build_meta"
+diff --git a/setup.py b/setup.py
+index aeefecb..5dbca89 100644
+--- a/setup.py
++++ b/setup.py
+@@ -221,6 +221,7 @@ def has_ext_modules(foo):
+ 
+ def run_setup(with_extensions=True):
+     extensions = []
++    options = {}
+     if with_extensions:
+         extensions = [
+             Extension(
+@@ -232,6 +233,14 @@ def run_setup(with_extensions=True):
+                 depends=glob.glob('%s/*.h' % srcdir) + ['setup.py'],
+             ),
+         ]
++    else:
++        import packaging.tags
++
++        tag_name = packaging.tags.interpreter_name()
++        tag_version = packaging.tags.interpreter_version()
++        options['bdist_wheel'] = {
++            'python_tag':tag_name+tag_version,
++        }
+     packages = find_packages(
+         where=pkgdir,
+         exclude=['ez_setup', 'examples', 'doc',],
+@@ -276,6 +285,7 @@ def run_setup(with_extensions=True):
+         packages=packages,
+         package_dir={'': pkgdir},
+         ext_modules=extensions,
++        options=options,
+     )
+     # add dependencies
+     depend = [dill_version]
diff --git a/dev-python/multiprocess/multiprocess-0.70.17.ebuild b/dev-python/multiprocess/multiprocess-0.70.17-r1.ebuild
index c1bc58bac6d9..966963af1cdb 100644
--- a/dev-python/multiprocess/multiprocess-0.70.17.ebuild
+++ b/dev-python/multiprocess/multiprocess-0.70.17-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
@@ -29,6 +29,21 @@ BDEPEND="
 	)
 "
 
+distutils_enable_tests unittest
+
+src_prepare() {
+	local PATCHES=(
+		# https://github.com/uqfoundation/multiprocess/pull/197
+		"${FILESDIR}/${P}-wheel-tag.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# https://github.com/uqfoundation/multiprocess/issues/196
+	sed -i -e '/python-tag/d' setup.cfg || die
+}
+
 python_test() {
-	"${EPYTHON}" py${EPYTHON#python}/multiprocess/tests/__main__.py -v || die
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
 }