From 1cfea2a84c51291a77ab820b6871efcff10c148d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 7 Nov 2022 21:22:54 +0000 Subject: gentoo auto-resync : 07:11:2022 - 21:22:53 --- sci-libs/Manifest.gz | Bin 44391 -> 44392 bytes sci-libs/scikit-learn/Manifest | 7 --- .../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 ------------------ 6 files changed, 242 deletions(-) delete mode 100644 sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch delete mode 100644 sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild delete mode 100644 sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild delete mode 100644 sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 1802b3f25433..d4cd25d4a819 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest index d5c64329ff37..607072da784e 100644 --- a/sci-libs/scikit-learn/Manifest +++ b/sci-libs/scikit-learn/Manifest @@ -1,10 +1,3 @@ -AUX scikit-learn-0.24.2-no-O3.patch 2346 BLAKE2B b4186a3e6a242ac964f4970adf227d2c6512141faf89828df60626aef73ab3d3de9fdeaf5fd31e230d196293b45feb11ff599a31b882ef86e1e563ff9209d7e6 SHA512 a6f2b74c424a000675ad838d95c71e459ca392f600875839cc5a740249a5db08e3d7968f87ae587398259d8dbf5ece91fe114f7c59581a32a03f3e9d183f81e8 -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 -EBUILD scikit-learn-0.24.2.ebuild 1813 BLAKE2B 179cc80ad5984f5179f156ef4114fe1a009d2d6258c758f030e832f191c477b1c1b22758cbbdb51ac95d7ebdc52341f9bba6fde02482dbdccf92c19e82fbf774 SHA512 0877f97ab8bae1392b183fdf26bc7f5036c1b7ddf8c58fab8acf19e6756592aa3c05128e9c34416d11cb2202e7c886b44b5d3929a2bf120d078a52965762dbef -EBUILD scikit-learn-1.0.2.ebuild 1340 BLAKE2B 1984373b7d7f56884a502dd015ab1803f51e124baa76895a7a3e9f162836dc98f01df8497834857250a0bcd7cedcb9eb76b243ca4d4fdd9195f42f0f57926dbf SHA512 1d731915b21f348458a2443bd577cef7761f1aa644a8c7dbbd5f78762e19280f8bdcb2a041ab8adabc809042ca0889b9e266fcb95d466d2ccc2a34d8d0d68c6a -EBUILD scikit-learn-1.1.1.ebuild 1529 BLAKE2B 3b307b4ef2f84580e777a08c6051672f05a04ce734cace26a1914154be548dea65de135440283d42c838dead454d97d539c30ddc338c989f33138f2e0675e72e SHA512 04d231193cd26225cee1b0a76fff119b29bbd7db7a5f085eead7c2d308b75f0410936451d058d04f6cb2b783f024daeb30496f6616d36c1d02c75ebaf71aea3e EBUILD scikit-learn-1.1.2.ebuild 1527 BLAKE2B 249a426ae389ff77af6a04897f5d65eee1fc5b42d385e6a24d7e892f23e202a4ced760dd7ee9bd5e871c14d2d4fa3f02ff6d94ba93af14e3e3e2edd7f45c039d SHA512 96f175caeeae88c84bc362d28607e75de2a2c2a300bac5a63417a781ec20fca2dd9672ed42057e68e61e0452b7d776e97de67525b8e68ae51fbcfd16777cb5c0 MISC metadata.xml 614 BLAKE2B b5425c2d022592581647c9b97c0ab22bfc2afe347b2e5ea22f141245238f145322f39406c62318ba1e6af1462b2691267b39976bfde38faaf1d28b1d29c4e015 SHA512 74ac79123848bc385c29fcfdc4a1e780529dda685c1deb5eb722f5d4919ee6ac9d80798d52c4af0be0cc8dbbaea3784963dd97e2b7c1258cc2f5605b0bc8907a 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 -} -- cgit v1.2.3