From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-learn/, sci-libs/scikit-learn/files/
Date: Mon, 7 Nov 2022 15:44:59 +0000 (UTC) [thread overview]
Message-ID: <1667835883.d303c68abfe1c5b566a6373462c85656d200bc8e.mgorny@gentoo> (raw)
commit: d303c68abfe1c5b566a6373462c85656d200bc8e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 7 15:44:43 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 15:44:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d303c68a
sci-libs/scikit-learn: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/scikit-learn/Manifest | 3 -
.../files/scikit-learn-0.24.2-no-O3.patch | 55 -----------------
sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild | 68 ----------------------
sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild | 53 -----------------
sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild | 59 -------------------
5 files changed, 238 deletions(-)
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index ceac4b8a36cd..9751f4cfb522 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,4 +1 @@
-DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
-DIST scikit-learn-1.0.2.tar.gz 6783296 BLAKE2B c5894b83c616117ac69e99d3eafe6b7218e085bfae099b41d09ecafc5cf116d4ef6849e69de2c1d833be1eb1e2479c1d200147ec1fcf73798c4e341dcaaa4d79 SHA512 1921a722ce887e04db94586a8100f435ca26038c32f1841ed8c7d5f17b5c7a3dbf5e036f5b0fca0f9907c32f80db5b082cb04141d14d22719ad78f3cfef51415
-DIST scikit-learn-1.1.1.gh.tar.gz 6896597 BLAKE2B c08bde0c531d221c40eb385ecdaa34e655442704142fe0e59b206ab17fb19ecf76866aad7dcf06f7eff3932be375ccbbdf43e150285b4f829bfb36604c963672 SHA512 366df2f0eea4d7ebf8e02829cd140c90299ee4a572e07e4e153032ffa650a990dd5ffc7d33bf8a23a4c76fdd97e296c801bc1471c79075f5631b1a341eb297ac
DIST scikit-learn-1.1.2.gh.tar.gz 7104556 BLAKE2B e67e1deddf5a1134b57a146e8271a406cb257ffc92c9719e90f5b9d98e711b68bc67e3367660ecaad61aaec1794bb8999b4dd00b7d56e21eca8fcb2ee72cc9aa SHA512 58789c1e607d7de3339fa3b8928553ca96cef93e8da8fd13612aa78e5ebde8e6a55e3bf7845f9a45b78ed77da6a219d08d2c26318b602f937e0e3debd239293e
diff --git a/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch b/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch
deleted file mode 100644
index 58caf95a9cf1..000000000000
--- a/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/sklearn/manifold/setup.py b/sklearn/manifold/setup.py
-index 0db2d5d..fb4fc38 100644
---- a/sklearn/manifold/setup.py
-+++ b/sklearn/manifold/setup.py
-@@ -15,14 +15,14 @@ def configuration(parent_package="", top_path=None):
- config.add_extension("_utils",
- sources=["_utils.pyx"],
- include_dirs=[numpy.get_include()],
-- libraries=libraries,
-- extra_compile_args=["-O3"])
-+ libraries=libraries)
-+
-
- config.add_extension("_barnes_hut_tsne",
- sources=["_barnes_hut_tsne.pyx"],
- include_dirs=[numpy.get_include()],
-- libraries=libraries,
-- extra_compile_args=['-O3'])
-+ libraries=libraries)
-+
-
- config.add_subpackage('tests')
-
-diff --git a/sklearn/tree/setup.py b/sklearn/tree/setup.py
-index 079ae9d..b38ee4b 100644
---- a/sklearn/tree/setup.py
-+++ b/sklearn/tree/setup.py
-@@ -12,23 +12,19 @@ def configuration(parent_package="", top_path=None):
- config.add_extension("_tree",
- sources=["_tree.pyx"],
- include_dirs=[numpy.get_include()],
-- libraries=libraries,
-- extra_compile_args=["-O3"])
-+ libraries=libraries)
- config.add_extension("_splitter",
- sources=["_splitter.pyx"],
- include_dirs=[numpy.get_include()],
-- libraries=libraries,
-- extra_compile_args=["-O3"])
-+ libraries=libraries)
- config.add_extension("_criterion",
- sources=["_criterion.pyx"],
- include_dirs=[numpy.get_include()],
-- libraries=libraries,
-- extra_compile_args=["-O3"])
-+ libraries=libraries)
- config.add_extension("_utils",
- sources=["_utils.pyx"],
- include_dirs=[numpy.get_include()],
-- libraries=libraries,
-- extra_compile_args=["-O3"])
-+ libraries=libraries)
-
- config.add_subpackage("tests")
-
diff --git a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
deleted file mode 100644
index 0f809400b600..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/"
-SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="examples"
-
-DEPEND="
- virtual/blas:=
- virtual/cblas:=
-"
-RDEPEND="
- ${DEPEND}
- dev-python/wheel[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/threadpoolctl[${PYTHON_USEDEP}]
-"
-
-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 \
-# sci-libs/scikit-image
-
-PATCHES=( "${FILESDIR}"/${P}-no-O3.patch )
-
-python_test() {
- distutils_install_for_testing
- # manually run tests as they need some weird thingies
- # skip tests which need data files that are not installed
- local tfile
- for tfile in sklearn/tests/test_*.py ; do
- if [[ "${tfile}" =~ "test_multiclass.py" ||
- "${tfile}" =~ "test_multioutput.py" ||
- "${tfile}" =~ "test_pipeline.py" ]]; then
- continue
- fi
- einfo "Testing: ${tfile}"
- ${EPYTHON} "${tfile}" || die "tests failed for ${tfile} with ${EPYTHON}"
- done
-}
-
-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-learn/scikit-learn-1.0.2.ebuild b/sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild
deleted file mode 100644
index 8825ce648cf0..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/"
-SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="examples"
-
-# This is being very difficult
-RESTRICT="test"
-
-DEPEND="
- virtual/blas:=
- virtual/cblas:=
-"
-RDEPEND="
- ${DEPEND}
- dev-python/wheel[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/threadpoolctl[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install 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 \
-# sci-libs/scikit-image
-
-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-learn/scikit-learn-1.1.1.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild
deleted file mode 100644
index 5877d6d117d6..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/"
-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"
-IUSE="examples"
-
-# Fatal Python error: Segmentation fault
-RESTRICT="test"
-
-DEPEND="
- virtual/blas:=
- virtual/cblas:=
-"
-RDEPEND="
- ${DEPEND}
- dev-python/wheel[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/threadpoolctl[${PYTHON_USEDEP}]
-"
-
-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 \
-# sci-libs/scikit-image
-
-python_test() {
- # This needs to be run in the install dir
- cd "${WORKDIR}/${P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/sklearn" || die
- distutils-r1_python_test
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete || die
- distutils-r1_python_install_all
- use examples && dodoc -r examples
-}
next reply other threads:[~2022-11-07 15:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 15:44 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-29 17:41 [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-learn/, sci-libs/scikit-learn/files/ Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1667835883.d303c68abfe1c5b566a6373462c85656d200bc8e.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox