Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-learn/, sci-libs/scikit-learn/files/
Date: Mon, 07 Nov 2022 15:45:03
Message-Id: 1667835883.d303c68abfe1c5b566a6373462c85656d200bc8e.mgorny@gentoo
1 commit: d303c68abfe1c5b566a6373462c85656d200bc8e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 7 15:44:43 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 7 15:44:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d303c68a
7
8 sci-libs/scikit-learn: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sci-libs/scikit-learn/Manifest | 3 -
13 .../files/scikit-learn-0.24.2-no-O3.patch | 55 -----------------
14 sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild | 68 ----------------------
15 sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild | 53 -----------------
16 sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild | 59 -------------------
17 5 files changed, 238 deletions(-)
18
19 diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
20 index ceac4b8a36cd..9751f4cfb522 100644
21 --- a/sci-libs/scikit-learn/Manifest
22 +++ b/sci-libs/scikit-learn/Manifest
23 @@ -1,4 +1 @@
24 -DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
25 -DIST scikit-learn-1.0.2.tar.gz 6783296 BLAKE2B c5894b83c616117ac69e99d3eafe6b7218e085bfae099b41d09ecafc5cf116d4ef6849e69de2c1d833be1eb1e2479c1d200147ec1fcf73798c4e341dcaaa4d79 SHA512 1921a722ce887e04db94586a8100f435ca26038c32f1841ed8c7d5f17b5c7a3dbf5e036f5b0fca0f9907c32f80db5b082cb04141d14d22719ad78f3cfef51415
26 -DIST scikit-learn-1.1.1.gh.tar.gz 6896597 BLAKE2B c08bde0c531d221c40eb385ecdaa34e655442704142fe0e59b206ab17fb19ecf76866aad7dcf06f7eff3932be375ccbbdf43e150285b4f829bfb36604c963672 SHA512 366df2f0eea4d7ebf8e02829cd140c90299ee4a572e07e4e153032ffa650a990dd5ffc7d33bf8a23a4c76fdd97e296c801bc1471c79075f5631b1a341eb297ac
27 DIST scikit-learn-1.1.2.gh.tar.gz 7104556 BLAKE2B e67e1deddf5a1134b57a146e8271a406cb257ffc92c9719e90f5b9d98e711b68bc67e3367660ecaad61aaec1794bb8999b4dd00b7d56e21eca8fcb2ee72cc9aa SHA512 58789c1e607d7de3339fa3b8928553ca96cef93e8da8fd13612aa78e5ebde8e6a55e3bf7845f9a45b78ed77da6a219d08d2c26318b602f937e0e3debd239293e
28
29 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
30 deleted file mode 100644
31 index 58caf95a9cf1..000000000000
32 --- a/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch
33 +++ /dev/null
34 @@ -1,55 +0,0 @@
35 -diff --git a/sklearn/manifold/setup.py b/sklearn/manifold/setup.py
36 -index 0db2d5d..fb4fc38 100644
37 ---- a/sklearn/manifold/setup.py
38 -+++ b/sklearn/manifold/setup.py
39 -@@ -15,14 +15,14 @@ def configuration(parent_package="", top_path=None):
40 - config.add_extension("_utils",
41 - sources=["_utils.pyx"],
42 - include_dirs=[numpy.get_include()],
43 -- libraries=libraries,
44 -- extra_compile_args=["-O3"])
45 -+ libraries=libraries)
46 -+
47 -
48 - config.add_extension("_barnes_hut_tsne",
49 - sources=["_barnes_hut_tsne.pyx"],
50 - include_dirs=[numpy.get_include()],
51 -- libraries=libraries,
52 -- extra_compile_args=['-O3'])
53 -+ libraries=libraries)
54 -+
55 -
56 - config.add_subpackage('tests')
57 -
58 -diff --git a/sklearn/tree/setup.py b/sklearn/tree/setup.py
59 -index 079ae9d..b38ee4b 100644
60 ---- a/sklearn/tree/setup.py
61 -+++ b/sklearn/tree/setup.py
62 -@@ -12,23 +12,19 @@ def configuration(parent_package="", top_path=None):
63 - config.add_extension("_tree",
64 - sources=["_tree.pyx"],
65 - include_dirs=[numpy.get_include()],
66 -- libraries=libraries,
67 -- extra_compile_args=["-O3"])
68 -+ libraries=libraries)
69 - config.add_extension("_splitter",
70 - sources=["_splitter.pyx"],
71 - include_dirs=[numpy.get_include()],
72 -- libraries=libraries,
73 -- extra_compile_args=["-O3"])
74 -+ libraries=libraries)
75 - config.add_extension("_criterion",
76 - sources=["_criterion.pyx"],
77 - include_dirs=[numpy.get_include()],
78 -- libraries=libraries,
79 -- extra_compile_args=["-O3"])
80 -+ libraries=libraries)
81 - config.add_extension("_utils",
82 - sources=["_utils.pyx"],
83 - include_dirs=[numpy.get_include()],
84 -- libraries=libraries,
85 -- extra_compile_args=["-O3"])
86 -+ libraries=libraries)
87 -
88 - config.add_subpackage("tests")
89 -
90
91 diff --git a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
92 deleted file mode 100644
93 index 0f809400b600..000000000000
94 --- a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
95 +++ /dev/null
96 @@ -1,68 +0,0 @@
97 -# Copyright 2020-2021 Gentoo Authors
98 -# Distributed under the terms of the GNU General Public License v2
99 -
100 -EAPI=7
101 -
102 -PYTHON_COMPAT=( python3_{8..10} )
103 -DISTUTILS_IN_SOURCE_BUILD=1
104 -inherit distutils-r1
105 -
106 -DESCRIPTION="Machine learning library for Python"
107 -HOMEPAGE="https://scikit-learn.org/stable/"
108 -SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
109 -
110 -LICENSE="BSD"
111 -SLOT="0"
112 -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
113 -IUSE="examples"
114 -
115 -DEPEND="
116 - virtual/blas:=
117 - virtual/cblas:=
118 -"
119 -RDEPEND="
120 - ${DEPEND}
121 - dev-python/wheel[${PYTHON_USEDEP}]
122 - dev-python/cython[${PYTHON_USEDEP}]
123 - dev-python/joblib[${PYTHON_USEDEP}]
124 - dev-python/numpy[${PYTHON_USEDEP}]
125 - dev-python/scipy[${PYTHON_USEDEP}]
126 - dev-python/threadpoolctl[${PYTHON_USEDEP}]
127 -"
128 -
129 -distutils_enable_tests pytest
130 -# For some reason this wants to use urllib to fetch things from the internet
131 -# distutils_enable_sphinx doc \
132 -# dev-python/matplotlib \
133 -# dev-python/memory_profiler \
134 -# dev-python/numpydoc \
135 -# dev-python/pandas \
136 -# dev-python/pillow \
137 -# dev-python/seaborn \
138 -# dev-python/sphinx-gallery \
139 -# dev-python/sphinx-prompt \
140 -# sci-libs/scikit-image
141 -
142 -PATCHES=( "${FILESDIR}"/${P}-no-O3.patch )
143 -
144 -python_test() {
145 - distutils_install_for_testing
146 - # manually run tests as they need some weird thingies
147 - # skip tests which need data files that are not installed
148 - local tfile
149 - for tfile in sklearn/tests/test_*.py ; do
150 - if [[ "${tfile}" =~ "test_multiclass.py" ||
151 - "${tfile}" =~ "test_multioutput.py" ||
152 - "${tfile}" =~ "test_pipeline.py" ]]; then
153 - continue
154 - fi
155 - einfo "Testing: ${tfile}"
156 - ${EPYTHON} "${tfile}" || die "tests failed for ${tfile} with ${EPYTHON}"
157 - done
158 -}
159 -
160 -python_install_all() {
161 - find "${S}" -name \*LICENSE.txt -delete || die
162 - distutils-r1_python_install_all
163 - use examples && dodoc -r examples
164 -}
165
166 diff --git a/sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild b/sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild
167 deleted file mode 100644
168 index 8825ce648cf0..000000000000
169 --- a/sci-libs/scikit-learn/scikit-learn-1.0.2.ebuild
170 +++ /dev/null
171 @@ -1,53 +0,0 @@
172 -# Copyright 2020-2021 Gentoo Authors
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=8
176 -
177 -PYTHON_COMPAT=( python3_{8..10} )
178 -DISTUTILS_IN_SOURCE_BUILD=1
179 -inherit distutils-r1
180 -
181 -DESCRIPTION="Machine learning library for Python"
182 -HOMEPAGE="https://scikit-learn.org/stable/"
183 -SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
184 -
185 -LICENSE="BSD"
186 -SLOT="0"
187 -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
188 -IUSE="examples"
189 -
190 -# This is being very difficult
191 -RESTRICT="test"
192 -
193 -DEPEND="
194 - virtual/blas:=
195 - virtual/cblas:=
196 -"
197 -RDEPEND="
198 - ${DEPEND}
199 - dev-python/wheel[${PYTHON_USEDEP}]
200 - dev-python/cython[${PYTHON_USEDEP}]
201 - dev-python/joblib[${PYTHON_USEDEP}]
202 - dev-python/numpy[${PYTHON_USEDEP}]
203 - dev-python/scipy[${PYTHON_USEDEP}]
204 - dev-python/threadpoolctl[${PYTHON_USEDEP}]
205 -"
206 -
207 -distutils_enable_tests --install pytest
208 -# For some reason this wants to use urllib to fetch things from the internet
209 -# distutils_enable_sphinx doc \
210 -# dev-python/matplotlib \
211 -# dev-python/memory_profiler \
212 -# dev-python/numpydoc \
213 -# dev-python/pandas \
214 -# dev-python/pillow \
215 -# dev-python/seaborn \
216 -# dev-python/sphinx-gallery \
217 -# dev-python/sphinx-prompt \
218 -# sci-libs/scikit-image
219 -
220 -python_install_all() {
221 - find "${S}" -name \*LICENSE.txt -delete || die
222 - distutils-r1_python_install_all
223 - use examples && dodoc -r examples
224 -}
225
226 diff --git a/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild
227 deleted file mode 100644
228 index 5877d6d117d6..000000000000
229 --- a/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild
230 +++ /dev/null
231 @@ -1,59 +0,0 @@
232 -# Copyright 2020-2022 Gentoo Authors
233 -# Distributed under the terms of the GNU General Public License v2
234 -
235 -EAPI=8
236 -
237 -PYTHON_COMPAT=( python3_{8..10} )
238 -DISTUTILS_USE_PEP517=setuptools
239 -inherit distutils-r1
240 -
241 -DESCRIPTION="Machine learning library for Python"
242 -HOMEPAGE="https://scikit-learn.org/stable/"
243 -SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
244 -
245 -LICENSE="BSD"
246 -SLOT="0"
247 -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
248 -IUSE="examples"
249 -
250 -# Fatal Python error: Segmentation fault
251 -RESTRICT="test"
252 -
253 -DEPEND="
254 - virtual/blas:=
255 - virtual/cblas:=
256 -"
257 -RDEPEND="
258 - ${DEPEND}
259 - dev-python/wheel[${PYTHON_USEDEP}]
260 - dev-python/cython[${PYTHON_USEDEP}]
261 - dev-python/joblib[${PYTHON_USEDEP}]
262 - dev-python/numpy[${PYTHON_USEDEP}]
263 - dev-python/scipy[${PYTHON_USEDEP}]
264 - dev-python/threadpoolctl[${PYTHON_USEDEP}]
265 -"
266 -
267 -distutils_enable_tests pytest
268 -# For some reason this wants to use urllib to fetch things from the internet
269 -# distutils_enable_sphinx doc \
270 -# dev-python/matplotlib \
271 -# dev-python/memory_profiler \
272 -# dev-python/numpydoc \
273 -# dev-python/pandas \
274 -# dev-python/pillow \
275 -# dev-python/seaborn \
276 -# dev-python/sphinx-gallery \
277 -# dev-python/sphinx-prompt \
278 -# sci-libs/scikit-image
279 -
280 -python_test() {
281 - # This needs to be run in the install dir
282 - cd "${WORKDIR}/${P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/sklearn" || die
283 - distutils-r1_python_test
284 -}
285 -
286 -python_install_all() {
287 - find "${S}" -name \*LICENSE.txt -delete || die
288 - distutils-r1_python_install_all
289 - use examples && dodoc -r examples
290 -}