gentoo auto-resync : 14:08:2024 - 11:06:13

3 files changed, 91 insertions, 2 deletions

diff --git a/dev-python/scikit-image/Manifest b/dev-python/scikit-image/Manifest
index 78106b3926a9..85e1a109f917 100644
--- a/dev-python/scikit-image/Manifest
+++ b/dev-python/scikit-image/Manifest
@@ -1,6 +1,7 @@
+AUX scikit-image-0.24.0-py313.patch 2945 BLAKE2B 69d13d76218faed3c733b8ea88da99264913c32cc190e282a8f19a739fb0bb2d62cf5e3210d8a10ac824b1b43eb7447a29450de776524f2d4fb634fc63806d81 SHA512 643eb8269ed9af6345daa45d51470e400753876e9b7e4be147d2cd48ade109b9aee9fbc1527cc029e0d43f12aed88b45043255e175550aba8a4dde627db1a141
 DIST scikit-image-data-15735b54e85c02427f07c71e6456723495034805.tar.bz2 143900901 BLAKE2B c1352e76337250fe1a9d6e07f08b6c9b1e0aed922ab8e0a3a4a1ea175f593b3375522e59550d30a22d392c34fef26d638c007c2af3d991887e02e7c68e56ebbb SHA512 d113dd258b35be710d841f9900cfbfe7103d1190b042489de88dd504b56277edac9a98fed5517e57725c5292fe26528267a06ff313bf6500b669d872c4481146
 DIST scikit_image-0.23.2.tar.gz 22678261 BLAKE2B 11c44676e9f7bce7735e85d8416175a55b1808807b99597d60495dc2b0c961a05a514b5ec456665a25d31cc09a20e430c331cfd5bc10afa01ca4070722aa03f8 SHA512 8abf6c2bb92a75524d254265822cdc49db636a482efe0d6459fc113f6898bc5c19ad58905a5020a9c4262f55993ad2e8d13810023c62d06c5ee9854666f5337f
 DIST scikit_image-0.24.0.tar.gz 22693928 BLAKE2B f165f702908fe446b459de3db0ec056a4b79d7266f85bc81c991569c1e492c22d238e8553d8f035abd83d4d3c4b449304e74b55d8bf558cac977c3ea5f0c864a SHA512 becb062725b4c1f64e12a1f775175e48dbce1b989c1e8f40ec04ff79cb926740be514b9a0a68e3f9e17fb0d3c7b860c7451b91eb178bbae93521e02e3e8e92db
 EBUILD scikit-image-0.23.2.ebuild 3215 BLAKE2B be34b34b47c26ac9e5756cc76d1ed7b2cc588a2c8acb31629db966fdb525e083b1bf7a776d132de256904d61e524f88a73bbd1d587ac7feb94a3ac8e0beaafb0 SHA512 ec3d7530beb99c996f94f4b23f85bfa5df98a2bb5ce5ee2e2d7d50992d1b1d419f3222b0a0b7dd9b3c5fcae936f87c7b9c91570f5e866153f58c9bf1e6fb04a1
-EBUILD scikit-image-0.24.0.ebuild 3215 BLAKE2B be34b34b47c26ac9e5756cc76d1ed7b2cc588a2c8acb31629db966fdb525e083b1bf7a776d132de256904d61e524f88a73bbd1d587ac7feb94a3ac8e0beaafb0 SHA512 ec3d7530beb99c996f94f4b23f85bfa5df98a2bb5ce5ee2e2d7d50992d1b1d419f3222b0a0b7dd9b3c5fcae936f87c7b9c91570f5e866153f58c9bf1e6fb04a1
+EBUILD scikit-image-0.24.0.ebuild 3359 BLAKE2B 9e173381f51ee0b650c6b5a03b2f443bcece4090604af6cc9ce61d7149163820e274a5a7177571628b1e980e808e1c19c2a0a555cdfdbddf2ed6b3af2cf14115 SHA512 9c720c7685a5388ff4bb33611fbcb243157597796ad880cf3975c5dd9ff0ddc68a2567f9b651b248bef5246355e3db3d719a19772c5a4628b4c2a844b4baa667
 MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/dev-python/scikit-image/files/scikit-image-0.24.0-py313.patch b/dev-python/scikit-image/files/scikit-image-0.24.0-py313.patch
new file mode 100644
index 000000000000..664a2388c08e
--- /dev/null
+++ b/dev-python/scikit-image/files/scikit-image-0.24.0-py313.patch
@@ -0,0 +1,82 @@
+From ee41933e3ea15769cea32a514cdaeecbe84b70b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= <andfoy@gmail.com>
+Date: Wed, 31 Jul 2024 11:43:59 -0500
+Subject: [PATCH] Add CI to test scikit-image against free-threaded Python 3.13
+ (#7463)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+enables testing scikit-image against free-threaded Python,
+this is part of the ongoing effort to test projects against the
+changes proposed in PEP703
+
+---------
+
+Co-authored-by: Stefan van der Walt <sjvdwalt@gmail.com>
+Co-authored-by: Lars Grüter <lagru+github@mailbox.org>
+---
+ .github/workflows/tests.yml     | 26 ++++++++++++++++++++++++++
+ TODO.txt                        |  2 ++
+ meson.build                     |  2 +-
+ skimage/measure/_regionprops.py |  9 ++++++---
+ skimage/meson.build             | 10 +++++++++-
+ skimage/transform/_geometric.py |  2 +-
+ skimage/util/_map_array.py      |  2 +-
+ tools/github/before_install.sh  |  6 ++++++
+ 8 files changed, 52 insertions(+), 7 deletions(-)
+
+diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py
+index 9f34d6a1c..82a03b394 100644
+--- a/skimage/measure/_regionprops.py
++++ b/skimage/measure/_regionprops.py
+@@ -1,4 +1,5 @@
+ import inspect
++import sys
+ from functools import wraps
+ from math import atan2
+ from math import pi as PI
+@@ -1406,9 +1407,11 @@ def _parse_docs():
+     import textwrap
+ 
+     doc = regionprops.__doc__ or ''
+-    matches = re.finditer(
+-        r'\*\*(\w+)\*\* \:.*?\n(.*?)(?=\n    [\*\S]+)', doc, flags=re.DOTALL
+-    )
++    arg_regex = r'\*\*(\w+)\*\* \:.*?\n(.*?)(?=\n    [\*\S]+)'
++    if sys.version_info >= (3, 13):
++        arg_regex = r'\*\*(\w+)\*\* \:.*?\n(.*?)(?=\n[\*\S]+)'
++
++    matches = re.finditer(arg_regex, doc, flags=re.DOTALL)
+     prop_doc = {m.group(1): textwrap.dedent(m.group(2)) for m in matches}
+ 
+     return prop_doc
+diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py
+index 6f696e95b..56cedae63 100644
+--- a/skimage/transform/_geometric.py
++++ b/skimage/transform/_geometric.py
+@@ -687,7 +687,7 @@ class ProjectiveTransform(_GeometricTransform):
+ 
+         return dst[:, :ndim]
+ 
+-    def __array__(self, dtype=None):
++    def __array__(self, dtype=None, copy=None):
+         if dtype is None:
+             return self.params
+         else:
+diff --git a/skimage/util/_map_array.py b/skimage/util/_map_array.py
+index 1f852fdb6..125dfb211 100644
+--- a/skimage/util/_map_array.py
++++ b/skimage/util/_map_array.py
+@@ -129,7 +129,7 @@ class ArrayMap:
+         """Return one more than the maximum label value being remapped."""
+         return np.max(self.in_values) + 1
+ 
+-    def __array__(self, dtype=None):
++    def __array__(self, dtype=None, copy=None):
+         """Return an array that behaves like the arraymap when indexed.
+ 
+         This array can be very large: it is the size of the largest value
+-- 
+2.45.2
+
diff --git a/dev-python/scikit-image/scikit-image-0.24.0.ebuild b/dev-python/scikit-image/scikit-image-0.24.0.ebuild
index 2ec63290c17b..5bffa476e8a6 100644
--- a/dev-python/scikit-image/scikit-image-0.24.0.ebuild
+++ b/dev-python/scikit-image/scikit-image-0.24.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=meson-python
 DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 optfeature pypi
 
@@ -51,6 +51,12 @@ distutils_enable_tests pytest
 # There is a programmable error in your configuration file:
 #distutils_enable_sphinx doc/source dev-python/numpydoc dev-python/myst-parser
 
+PATCHES=(
+	# https://github.com/scikit-image/scikit-image/pull/7463
+	# stripped down to minimal 3.13 support
+	"${FILESDIR}/${P}-py313.patch"
+)
+
 src_test() {
 	# for some reason, upstream refetches data that's already in the tarball
 	# sigh