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

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

7 files changed, 8 insertions, 104 deletions

diff --git a/sci-libs/datasets/datasets-2.18.0.ebuild b/sci-libs/datasets/datasets-2.18.0.ebuild
index a5ffd9689033..71e6cd37d0a0 100644
--- a/sci-libs/datasets/datasets-2.18.0.ebuild
+++ b/sci-libs/datasets/datasets-2.18.0.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
 		dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/tqdm[${PYTHON_USEDEP}]
 		dev-python/xxhash[${PYTHON_USEDEP}]
 		dev-python/zstandard[${PYTHON_USEDEP}]
 		sci-libs/huggingface_hub[${PYTHON_USEDEP}]
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
deleted file mode 100644
index 7023e5de75af..000000000000
--- a/sci-libs/scikit-learn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scikit-learn-1.3.2.gh.tar.gz 7650823 BLAKE2B 170699917f46d6d3f4b9ebc314bc1ec45687dad0a4aec5d2cee6e288b5dbe508bad6dd80406501f289a33593c6482067393e9dc28155f85a4872a34523bf4199 SHA512 a3799e9b39b755a50ba225f836904a378f7d83a08274c614d0485e4d4d4a7b0c7adba2dbb6612f2ccb4e5167f872214a2853eff69d767dc70f52369bda7a230b
diff --git a/sci-libs/scikit-learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml
deleted file mode 100644
index 8700c73ecc29..000000000000
--- a/sci-libs/scikit-learn/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    sklearn is a python library for machine learning. It aims to
-    implement classic machine learning algorithms while remaining simple
-    and efficient.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">scikit-learn</remote-id>
-    <remote-id type="github">scikit-learn/scikit-learn</remote-id>
-  </upstream>
-</pkgmetadata>
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
deleted file mode 100644
index 1f42ebe8f21a..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="
-	https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn/
-	https://pypi.org/project/scikit-learn/
-"
-SRC_URI="
-	https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/wheel[${PYTHON_USEDEP}]
-	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.22.3[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/threadpoolctl-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-# For some reason this wants to use urllib to fetch things from the internet
-# distutils_enable_sphinx doc \
-# 	dev-python/matplotlib \
-# 	dev-python/memory-profiler \
-# 	dev-python/numpydoc \
-# 	dev-python/pandas \
-# 	dev-python/pillow \
-# 	dev-python/seaborn \
-# 	dev-python/sphinx-gallery \
-# 	dev-python/sphinx-prompt \
-# 	dev-python/scikit-image
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# test broken with newer scipy, fixed upstream
-		# https://github.com/scikit-learn/scikit-learn/issues/27578
-		manifold/tests/test_locally_linear.py::test_singular_matrix
-		# TODO
-		gaussian_process/kernels.py::sklearn.gaussian_process.kernels.ExpSineSquared
-	)
-
-	rm -rf sklearn || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs sklearn
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete || die
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild
index 694cd3ffafeb..e908335940a8 100644
--- a/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,8 +20,8 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+	>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 	>=dev-python/scipy-0.19.1[${PYTHON_USEDEP}]
-	>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
index 644fcd2382dc..b712b3f5252d 100644
--- a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Sequential model-based optimization library"
@@ -19,8 +19,8 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+	>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 	>=dev-python/scipy-0.19.1[${PYTHON_USEDEP}]
-	>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild b/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild
index 884fcc8f754c..15490e06935d 100644
--- a/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild
+++ b/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Python framework for sequence labeling evaluation"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+	dev-python/scikit-learn[${PYTHON_USEDEP}]
 "
 BDEPEND="test? (
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]