[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-learn/, dev-python/plotly/, sci-libs/scikit-image/, ...

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-learn/, dev-python/plotly/, sci-libs/scikit-image/, ...

[Michał Górny]

commit:     dc3ca712259787a759fe050e49f0c84ca914d4b2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 20:15:03 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 20:15:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3ca712

Move {sci-libs → dev-python}/scikit-image

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/plotly/plotly-5.18.0.ebuild                                | 4 ++--
 {sci-libs => dev-python}/scikit-image/Manifest                        | 0
 .../scikit-image/files/scikit-image-0.22.0-no-numpydoc.patch          | 0
 {sci-libs => dev-python}/scikit-image/metadata.xml                    | 0
 {sci-libs => dev-python}/scikit-image/scikit-image-0.19.3-r1.ebuild   | 2 +-
 {sci-libs => dev-python}/scikit-image/scikit-image-0.22.0.ebuild      | 0
 dev-python/trimesh/trimesh-4.0.10.ebuild                              | 2 +-
 dev-python/trimesh/trimesh-4.0.8.ebuild                               | 2 +-
 dev-python/trimesh/trimesh-4.0.9.ebuild                               | 2 +-
 profiles/updates/1Q-2024                                              | 1 +
 sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild                       | 2 +-
 sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild                    | 2 +-
 12 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-python/plotly/plotly-5.18.0.ebuild b/dev-python/plotly/plotly-5.18.0.ebuild
index 6ff4531c953a..ded586e2d189 100644
--- a/dev-python/plotly/plotly-5.18.0.ebuild
+++ b/dev-python/plotly/plotly-5.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,7 +50,7 @@ BDEPEND="
 		dev-python/shapely[${PYTHON_USEDEP}]
 		dev-python/statsmodels[${PYTHON_USEDEP}]
 		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
+		dev-python/scikit-image[${PYTHON_USEDEP}]
 	)
 "
 

diff --git a/sci-libs/scikit-image/Manifest b/dev-python/scikit-image/Manifest
similarity index 100%
rename from sci-libs/scikit-image/Manifest
rename to dev-python/scikit-image/Manifest

diff --git a/sci-libs/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
similarity index 100%
rename from sci-libs/scikit-image/files/scikit-image-0.22.0-no-numpydoc.patch
rename to dev-python/scikit-image/files/scikit-image-0.22.0-no-numpydoc.patch

diff --git a/sci-libs/scikit-image/metadata.xml b/dev-python/scikit-image/metadata.xml
similarity index 100%
rename from sci-libs/scikit-image/metadata.xml
rename to dev-python/scikit-image/metadata.xml

diff --git a/sci-libs/scikit-image/scikit-image-0.19.3-r1.ebuild b/dev-python/scikit-image/scikit-image-0.19.3-r1.ebuild
similarity index 97%
rename from sci-libs/scikit-image/scikit-image-0.19.3-r1.ebuild
rename to dev-python/scikit-image/scikit-image-0.19.3-r1.ebuild
index 625518acb25e..3b0060a33375 100644
--- a/sci-libs/scikit-image/scikit-image-0.19.3-r1.ebuild
+++ b/dev-python/scikit-image/scikit-image-0.19.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/sci-libs/scikit-image/scikit-image-0.22.0.ebuild b/dev-python/scikit-image/scikit-image-0.22.0.ebuild
similarity index 100%
rename from sci-libs/scikit-image/scikit-image-0.22.0.ebuild
rename to dev-python/scikit-image/scikit-image-0.22.0.ebuild

diff --git a/dev-python/trimesh/trimesh-4.0.10.ebuild b/dev-python/trimesh/trimesh-4.0.10.ebuild
index a0760cd1d5cb..4a4ed4607e7b 100644
--- a/dev-python/trimesh/trimesh-4.0.10.ebuild
+++ b/dev-python/trimesh/trimesh-4.0.10.ebuild
@@ -64,5 +64,5 @@ pkg_postinst() {
 	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
 	optfeature "loading a number of additional mesh formats" dev-python/meshio
 	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
 }

diff --git a/dev-python/trimesh/trimesh-4.0.8.ebuild b/dev-python/trimesh/trimesh-4.0.8.ebuild
index bb523b6bc159..ce63b84c1613 100644
--- a/dev-python/trimesh/trimesh-4.0.8.ebuild
+++ b/dev-python/trimesh/trimesh-4.0.8.ebuild
@@ -64,5 +64,5 @@ pkg_postinst() {
 	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
 	optfeature "loading a number of additional mesh formats" dev-python/meshio
 	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
 }

diff --git a/dev-python/trimesh/trimesh-4.0.9.ebuild b/dev-python/trimesh/trimesh-4.0.9.ebuild
index a0760cd1d5cb..4a4ed4607e7b 100644
--- a/dev-python/trimesh/trimesh-4.0.9.ebuild
+++ b/dev-python/trimesh/trimesh-4.0.9.ebuild
@@ -64,5 +64,5 @@ pkg_postinst() {
 	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
 	optfeature "loading a number of additional mesh formats" dev-python/meshio
 	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
 }

diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 9db6dbc326c6..c041d1163c85 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -69,3 +69,4 @@ move dev-util/sysdig dev-debug/sysdig
 move dev-util/systemtap dev-debug/systemtap
 move dev-util/scap-driver dev-debug/scap-driver
 move dev-util/icmake dev-build/icmake
+move sci-libs/scikit-image dev-python/scikit-image

diff --git a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild
index fae3c17885fe..19c4f027d4bc 100644
--- a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild
@@ -49,7 +49,7 @@ distutils_enable_tests pytest
 # 	dev-python/seaborn \
 # 	dev-python/sphinx-gallery \
 # 	dev-python/sphinx-prompt \
-# 	sci-libs/scikit-image
+# 	dev-python/scikit-image
 
 python_test() {
 	# This needs to be run in the install dir

diff --git a/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild b/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild
index 88e988c50a5b..63eb9f3b7b75 100644
--- a/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild
@@ -46,7 +46,7 @@ distutils_enable_tests pytest
 # 	dev-python/seaborn \
 # 	dev-python/sphinx-gallery \
 # 	dev-python/sphinx-prompt \
-# 	sci-libs/scikit-image
+# 	dev-python/scikit-image
 
 python_test() {
 	# This needs to be run in the install dir