1 |
commit: 994f577def626844490506ecfbe6c05bfe39997a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 23 12:38:19 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 24 03:58:00 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994f577d |
7 |
|
8 |
dev-python/scipy: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/scipy/Manifest | 3 - |
13 |
.../files/scipy-1.8.0-skip-build-revert.patch | 22 --- |
14 |
dev-python/scipy/scipy-1.8.0.ebuild | 191 --------------------- |
15 |
3 files changed, 216 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest |
18 |
index 76487212a3c9..238fc4ae29ac 100644 |
19 |
--- a/dev-python/scipy/Manifest |
20 |
+++ b/dev-python/scipy/Manifest |
21 |
@@ -1,6 +1,3 @@ |
22 |
-DIST scipy-1.8.0.tar.gz 38313602 BLAKE2B 3f071ad3dfa350bba7eaf8e06c8bdb660f9dc1ef0e0bfc1eb1be2c400f947b2b26d62066a4b0f603ae56244131aff6e4c5b7e87cfd2aa7b278e3071062a4bf02 SHA512 674652728ae76479d17189e6974895bb838a8e83b17b9fb91c5f86faebf2a1387e1466555ac5b51d05c293f9b31b9a72e634f5858105ea984ca94bd2f05bbb4c |
23 |
DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea |
24 |
-DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672 |
25 |
DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac |
26 |
-DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79 |
27 |
DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728 |
28 |
|
29 |
diff --git a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch b/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch |
30 |
deleted file mode 100644 |
31 |
index caefc334a973..000000000000 |
32 |
--- a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch |
33 |
+++ /dev/null |
34 |
@@ -1,22 +0,0 @@ |
35 |
-From 2b6392eeeb8ef5225ace15e8a1553fa87409272f Mon Sep 17 00:00:00 2001 |
36 |
-From: Ralf Gommers <ralf.gommers@×××××.com> |
37 |
-Date: Wed, 29 Dec 2021 22:47:13 +0100 |
38 |
-Subject: [PATCH] Revert "BLD Respect the --skip-build flag in setup.py" |
39 |
- |
40 |
---- |
41 |
- setup.py | 2 -- |
42 |
- 1 file changed, 2 deletions(-) |
43 |
- |
44 |
-diff --git a/setup.py b/setup.py |
45 |
-index 002531fcc00..d91916e5894 100755 |
46 |
---- a/setup.py |
47 |
-+++ b/setup.py |
48 |
-@@ -488,8 +488,6 @@ def setup_package(): |
49 |
- if "--force" in sys.argv: |
50 |
- run_build = True |
51 |
- sys.argv.remove('--force') |
52 |
-- elif "--skip-build" in sys.argv: |
53 |
-- run_build = False |
54 |
- else: |
55 |
- # Raise errors for unsupported commands, improve help output, etc. |
56 |
- run_build = check_setuppy_command() |
57 |
|
58 |
diff --git a/dev-python/scipy/scipy-1.8.0.ebuild b/dev-python/scipy/scipy-1.8.0.ebuild |
59 |
deleted file mode 100644 |
60 |
index a502daa1354f..000000000000 |
61 |
--- a/dev-python/scipy/scipy-1.8.0.ebuild |
62 |
+++ /dev/null |
63 |
@@ -1,191 +0,0 @@ |
64 |
-# Copyright 1999-2022 Gentoo Authors |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
- |
67 |
-EAPI=7 |
68 |
- |
69 |
-PYTHON_COMPAT=( python3_{8..10} ) |
70 |
-PYTHON_REQ_USE="threads(+)" |
71 |
- |
72 |
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs |
73 |
- |
74 |
-# upstream is slacking forever with doc updates |
75 |
-DOC_PV=1.7.1 |
76 |
-DESCRIPTION="Scientific algorithms library for Python" |
77 |
-HOMEPAGE=" |
78 |
- https://scipy.org/ |
79 |
- https://github.com/scipy/scipy/ |
80 |
- https://pypi.org/project/scipy/ |
81 |
-" |
82 |
-SRC_URI=" |
83 |
- mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
84 |
- doc? ( |
85 |
- https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip |
86 |
- https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf |
87 |
- )" |
88 |
- |
89 |
-LICENSE="BSD LGPL-2" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" |
92 |
-IUSE="doc +pythran sparse" |
93 |
- |
94 |
-DEPEND=" |
95 |
- >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}] |
96 |
- sci-libs/arpack:0= |
97 |
- virtual/cblas |
98 |
- virtual/lapack |
99 |
- sparse? ( sci-libs/umfpack:0= )" |
100 |
-RDEPEND="${DEPEND} |
101 |
- dev-python/pillow[${PYTHON_USEDEP}]" |
102 |
-BDEPEND=" |
103 |
- dev-lang/swig |
104 |
- >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] |
105 |
- dev-python/pybind11[${PYTHON_USEDEP}] |
106 |
- virtual/pkgconfig |
107 |
- doc? ( app-arch/unzip ) |
108 |
- pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
109 |
- test? ( |
110 |
- dev-python/nose[${PYTHON_USEDEP}] |
111 |
- dev-python/pytest-xdist[${PYTHON_USEDEP}] |
112 |
- )" |
113 |
- |
114 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
115 |
- |
116 |
-distutils_enable_tests pytest |
117 |
- |
118 |
-PATCHES=( |
119 |
- "${FILESDIR}"/${P}-skip-build-revert.patch |
120 |
-) |
121 |
- |
122 |
-src_unpack() { |
123 |
- default |
124 |
- if use doc; then |
125 |
- unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die |
126 |
- fi |
127 |
-} |
128 |
- |
129 |
-pc_incdir() { |
130 |
- $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ |
131 |
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' |
132 |
-} |
133 |
- |
134 |
-pc_libdir() { |
135 |
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \ |
136 |
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' |
137 |
-} |
138 |
- |
139 |
-pc_libs() { |
140 |
- $(tc-getPKG_CONFIG) --libs-only-l $@ | \ |
141 |
- sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ |
142 |
- -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ |
143 |
- | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' |
144 |
-} |
145 |
- |
146 |
-python_prepare_all() { |
147 |
- # scipy automatically detects libraries by default |
148 |
- export {FFTW,FFTW3,UMFPACK}=None |
149 |
- use sparse && unset UMFPACK |
150 |
- # the missing symbols are in -lpythonX.Y, but since the version can |
151 |
- # differ, we just introduce the same scaryness as on Linux/ELF |
152 |
- [[ ${CHOST} == *-darwin* ]] \ |
153 |
- && append-ldflags -bundle "-undefined dynamic_lookup" \ |
154 |
- || append-ldflags -shared |
155 |
- [[ -z ${FC} ]] && export FC="$(tc-getFC)" |
156 |
- # hack to force F77 to be FC until bug #278772 is fixed |
157 |
- [[ -z ${F77} ]] && export F77="$(tc-getFC)" |
158 |
- export F90="${FC}" |
159 |
- export SCIPY_FCONFIG="config_fc --noopt --noarch" |
160 |
- append-fflags -fPIC |
161 |
- |
162 |
- local libdir="${EPREFIX}"/usr/$(get_libdir) |
163 |
- cat >> site.cfg <<-EOF || die |
164 |
- [blas] |
165 |
- include_dirs = $(pc_incdir cblas) |
166 |
- library_dirs = $(pc_libdir cblas blas):${libdir} |
167 |
- blas_libs = $(pc_libs cblas blas) |
168 |
- [lapack] |
169 |
- library_dirs = $(pc_libdir lapack):${libdir} |
170 |
- lapack_libs = $(pc_libs lapack) |
171 |
- EOF |
172 |
- cat >> setup.cfg <<-EOF || die |
173 |
- [options] |
174 |
- zip_safe = False |
175 |
- EOF |
176 |
- |
177 |
- # TODO |
178 |
- sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \ |
179 |
- -i scipy/stats/tests/test_continuous_basic.py || die |
180 |
- |
181 |
- # Skip known-failing test. Broken on all versions in Gentoo for years. |
182 |
- # bug #743295 |
183 |
- sed -e 's:test_bisplev_integer_overflow:_&:' \ |
184 |
- -i scipy/interpolate/tests/test_fitpack.py || die |
185 |
- |
186 |
- # Skip a few 32-bit related failures |
187 |
- if use x86 ; then |
188 |
- # TODO: Tidy this up and switch to epytest |
189 |
- sed -i -e 's:test_nd_axis_m1:_&:' \ |
190 |
- -e 's:test_nd_axis_0:_&:' \ |
191 |
- -e 's:test_maxiter_worsening:_&:' \ |
192 |
- -e 's:test_pdist_jensenshannon_iris:_&:' \ |
193 |
- -e 's:test_align_vectors_single_vector:_&:' \ |
194 |
- scipy/signal/tests/test_spectral.py \ |
195 |
- scipy/spatial/tests/test_distance.py \ |
196 |
- scipy/spatial/transform/tests/test_rotation.py || die |
197 |
- fi |
198 |
- |
199 |
- if has_version ">=sci-libs/lapack-3.10"; then |
200 |
- sed -e 's:test_sort(:_&:' \ |
201 |
- -i scipy/linalg/tests/test_decomp.py || die |
202 |
- sed -e 's:test_solve_discrete_are:_&:' \ |
203 |
- -i scipy/linalg/tests/test_solvers.py || die |
204 |
- fi |
205 |
- |
206 |
- distutils-r1_python_prepare_all |
207 |
-} |
208 |
- |
209 |
-python_configure_all() { |
210 |
- export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) |
211 |
- |
212 |
- # bug 721860 |
213 |
- test-flag-FC -fallow-argument-mismatch && |
214 |
- append-fflags -fallow-argument-mismatch |
215 |
-} |
216 |
- |
217 |
-python_compile() { |
218 |
- # FIXME: parallel python building fails, bug #614464 |
219 |
- export ORIGINAL_MAKEOPTS="${MAKEOPTS}" |
220 |
- export MAKEOPTS=-j1 |
221 |
- |
222 |
- ${EPYTHON} tools/cythonize.py || die |
223 |
- distutils-r1_python_compile \ |
224 |
- ${SCIPY_FCONFIG} |
225 |
-} |
226 |
- |
227 |
-python_test() { |
228 |
- # fails with bdist_egg. should it be fixed in distutils-r1 eclass? |
229 |
- distutils_install_for_testing ${SCIPY_FCONFIG} |
230 |
- cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available" |
231 |
- |
232 |
- # Let's try using pytest again with xdist to speed things up. |
233 |
- # Note that using pytest is required to avoid dying b/c of a |
234 |
- # deprecation warning with distutils in Python 3.01. |
235 |
- epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")" |
236 |
-} |
237 |
- |
238 |
-python_install_all() { |
239 |
- use doc && \ |
240 |
- local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ |
241 |
- local HTML_DOCS=( "${WORKDIR}"/html/. ) |
242 |
- distutils-r1_python_install_all |
243 |
-} |
244 |
- |
245 |
-python_install() { |
246 |
- distutils-r1_python_install ${SCIPY_FCONFIG} |
247 |
- python_optimize |
248 |
-} |
249 |
- |
250 |
-pkg_postinst() { |
251 |
- elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" |
252 |
- elog "to your prefered image viewer. Example:" |
253 |
- elog " echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" |
254 |
-} |