gentoo auto-resync : 21:04:2024 - 12:05:28

4 files changed, 3 insertions, 112 deletions

diff --git a/dev-python/scikit-image/Manifest b/dev-python/scikit-image/Manifest
index 80499c5fb837..001d62d02547 100644
--- a/dev-python/scikit-image/Manifest
+++ b/dev-python/scikit-image/Manifest
@@ -1,9 +1,6 @@
-AUX scikit-image-0.22.0-no-numpydoc.patch 1664 BLAKE2B 65a4b565069bf21a44deae1de9cd4e66a9788e7cf3928bdf52b65325be89952a287ae713f019530f97effd92e462ea2aa94b4ad334c41d0f03d8c8d66b759f92 SHA512 38c38f4755dcb106b0683ea091b75d0923aa63e123c0e8c09eead13beec573dc65a696df955e6d58e873fadc9ec2bc95f3823ba2cb875477b627c09caa32c029
 DIST scikit-image-data-15735b54e85c02427f07c71e6456723495034805.tar.bz2 143900901 BLAKE2B c1352e76337250fe1a9d6e07f08b6c9b1e0aed922ab8e0a3a4a1ea175f593b3375522e59550d30a22d392c34fef26d638c007c2af3d991887e02e7c68e56ebbb SHA512 d113dd258b35be710d841f9900cfbfe7103d1190b042489de88dd504b56277edac9a98fed5517e57725c5292fe26528267a06ff313bf6500b669d872c4481146
-DIST scikit_image-0.22.0.tar.gz 22685018 BLAKE2B 7d0a65f75f5a58211e21501d6cc6a638f1d36e9a2198a3ad9ff2f230890496c41d5e6cdaed02bbaa62f26aa57fd24fc993656cbdfc2c9c9750147d0f325e56f1 SHA512 4b8c097cd5465f57b1c0879363fe3bdc0941decf2d1f8a881f13f2b7f3207c425f3a0cdcb4be0eed7b33d3ac2f3f8b1835d1cfa69cd3fa2ff5e0be11385fef48
-DIST scikit_image-0.23.0rc2.tar.gz 22677632 BLAKE2B b663065650e25a33ffec80ddd05df622bc62b1c1d3d0a831488d4dd23291b4f125458ae335782762b1d4dc1efa8cbedd5fcd7e6bbe62003967209e4ca4179bca SHA512 aa5f27d571ea49276aba8443a691b30a576d52145a17f13b8ea080a2abf0ed01c57fe50324c05e72bb4662a9ddbb480be94be6784ac3220ed6853b12d94ae06b
 DIST scikit_image-0.23.1.tar.gz 22676819 BLAKE2B 2d02bab4f8d6217c842f428a6758d467393a73a05ac741a49cd27fa6ee48335cf8fed4cc104296388d0e23c61ac3603f72d7bab44986c0d3d4073da383f89726 SHA512 7450387c3adcac15148c3ae4f43fd7da97ceabf3522302b7f3ab4cd02e5a9ec2cd9623f29e4aec3bb47668a231e0900724804619bb91aaaf97283d29c34392e6
-EBUILD scikit-image-0.22.0.ebuild 1822 BLAKE2B ccae73d104116b5c956ad569a059409d93b269a351c7e79cc8b5980948e3e02d49f1a4113c070ef665a3c754374cc90d229673336e3881ea5d5087ab1315ca95 SHA512 4ea0cd851a68620e802347906fc05390cc32020d33f688d93be3f2103a68b9cbcd0b3b2aae21136039e878b70710940aacfadc77e1743af65a98b5a6441e1a84
-EBUILD scikit-image-0.23.0_rc2.ebuild 3266 BLAKE2B c9bcb955f32dd6dc8d5674b9ac752f75b45bed0b0da517634151b30a0a9459b17d49c57b332027acf7abf090bb9f8930fb0b6f59478c80bf565073fa7d1852b6 SHA512 fe6ab5b29fc4951a5b30187d6951d04d64448faac3fbaa2110be0d26cb564090ca2d16e72e1684cd89abd7bd32e987c76f6e9f9a6aaa0dd09c679535386f9462
+DIST scikit_image-0.23.2.tar.gz 22678261 BLAKE2B 11c44676e9f7bce7735e85d8416175a55b1808807b99597d60495dc2b0c961a05a514b5ec456665a25d31cc09a20e430c331cfd5bc10afa01ca4070722aa03f8 SHA512 8abf6c2bb92a75524d254265822cdc49db636a482efe0d6459fc113f6898bc5c19ad58905a5020a9c4262f55993ad2e8d13810023c62d06c5ee9854666f5337f
 EBUILD scikit-image-0.23.1.ebuild 3266 BLAKE2B 2db28394ccba7f5a76119cb7226353011b8ef9e6a259036a6c7e08cd847b7955a8d34bab052299c0ce97c2fa4a1106631c4140838de57eef12d5a77ca99ac510 SHA512 c4fc85ccc675a6912bae933a2bc8dbda65bc729ea7057ca68983a88322ee54f82b383a1a9d8f2f025b5db90d1e8c8c3c850e32e68c7d237eda4ac62d04e9e723
+EBUILD scikit-image-0.23.2.ebuild 3266 BLAKE2B 2db28394ccba7f5a76119cb7226353011b8ef9e6a259036a6c7e08cd847b7955a8d34bab052299c0ce97c2fa4a1106631c4140838de57eef12d5a77ca99ac510 SHA512 c4fc85ccc675a6912bae933a2bc8dbda65bc729ea7057ca68983a88322ee54f82b383a1a9d8f2f025b5db90d1e8c8c3c850e32e68c7d237eda4ac62d04e9e723
 MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/dev-python/scikit-image/files/scikit-image-0.22.0-no-numpydoc.patch b/dev-python/scikit-image/files/scikit-image-0.22.0-no-numpydoc.patch
deleted file mode 100644
index 25137b5167c8..000000000000
--- a/dev-python/scikit-image/files/scikit-image-0.22.0-no-numpydoc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9b27f8e802c9513952c8a42450a4459fa357b89c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 26 Jan 2024 20:25:16 +0100
-Subject: [PATCH] Make it possible to run tests without numpydoc
-
-Skip the three tests requiring numpydoc when it is not installed.
-For `skimage/_shared/tests/test_utils.py`, use the existing
-`have_numpydoc` constant.
-For `skimage/measure/tests/test_regionprops.py`, use the standard
-`pytest.importorskip()` function.
-
-This makes it possible to successfully run the test suite when
-`numpydoc` is not installed.  This would be convenient for Gentoo
-since numpydoc is facing neverending test regressions (in its own test
-suite).
----
- skimage/measure/tests/test_regionprops.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py
-index 01a59dfbf..0b74d30a4 100644
---- a/skimage/measure/tests/test_regionprops.py
-+++ b/skimage/measure/tests/test_regionprops.py
-@@ -4,7 +4,6 @@ import re
- import numpy as np
- import pytest
- import scipy.ndimage as ndi
--import numpydoc
- from numpy.testing import (assert_allclose, assert_almost_equal,
-                            assert_array_almost_equal, assert_array_equal,
-                            assert_equal)
-@@ -1261,6 +1260,7 @@ def test_column_dtypes_correct():
- 
- 
- def test_all_documented_items_in_col_dtypes():
-+    numpydoc = pytest.importorskip("numpydoc")
-     docstring = numpydoc.docscrape.FunctionDoc(regionprops)
-     notes_lines = docstring['Notes']
-     property_lines = filter(lambda line: line.startswith('**'), notes_lines)
--- 
-2.43.0
-
diff --git a/dev-python/scikit-image/scikit-image-0.22.0.ebuild b/dev-python/scikit-image/scikit-image-0.22.0.ebuild
deleted file mode 100644
index 62ff8da8a3eb..000000000000
--- a/dev-python/scikit-image/scikit-image-0.22.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=meson-python
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="
-	https://scikit-image.org/
-	https://github.com/scikit-image/scikit-image/
-	https://pypi.org/project/scikit-image/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/imageio-2.27[${PYTHON_USEDEP}]
-	>=dev-python/lazy-loader-0.3[${PYTHON_USEDEP}]
-	>=dev-python/networkx-2.8[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9.0.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.8[sparse(+),${PYTHON_USEDEP}]
-	>=dev-python/tifffile-2022.8.12[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-DOCS=( CONTRIBUTORS.txt RELEASE.txt )
-
-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/7307
-	"${FILESDIR}/${P}-no-numpydoc.patch"
-)
-
-python_test() {
-	rm -rf skimage || die
-	epytest --pyargs skimage
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	optfeature "GTK" dev-python/pygtk
-	optfeature "Parallel computation" dev-python/dask
-	optfeature "io plugin providing most standard formats" dev-python/imread
-	optfeature "plotting" dev-python/matplotlib
-	optfeature "wavelet transformations" dev-python/pywavelets
-	optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-}
diff --git a/dev-python/scikit-image/scikit-image-0.23.0_rc2.ebuild b/dev-python/scikit-image/scikit-image-0.23.2.ebuild
index a4314f655ffc..cb08918d42e9 100644
--- a/dev-python/scikit-image/scikit-image-0.23.0_rc2.ebuild
+++ b/dev-python/scikit-image/scikit-image-0.23.2.ebuild
@@ -28,7 +28,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/imageio-2.33[${PYTHON_USEDEP}]
-	>=dev-python/lazy-loader-0.3[${PYTHON_USEDEP}]
+	>=dev-python/lazy-loader-0.4[${PYTHON_USEDEP}]
 	>=dev-python/networkx-2.8[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
 	>=dev-python/pillow-9.1[${PYTHON_USEDEP}]