1 |
commit: 0dc86ae6c53ec5511808e636b958a3a130145838 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 30 17:05:42 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 30 20:25:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc86ae6 |
7 |
|
8 |
dev-python/numpy: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/numpy/Manifest | 1 - |
13 |
.../files/numpy-1.17.4-no-hardcode-blasv2.patch | 47 ------- |
14 |
dev-python/numpy/numpy-1.19.5.ebuild | 145 --------------------- |
15 |
3 files changed, 193 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest |
18 |
index 2be41f6e7d9..42d7b76c750 100644 |
19 |
--- a/dev-python/numpy/Manifest |
20 |
+++ b/dev-python/numpy/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4 |
23 |
DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c |
24 |
DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a |
25 |
DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09 |
26 |
|
27 |
diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch |
28 |
deleted file mode 100644 |
29 |
index 850f70f4551..00000000000 |
30 |
--- a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch |
31 |
+++ /dev/null |
32 |
@@ -1,47 +0,0 @@ |
33 |
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
34 |
-index ba2b1f46c..09db18e69 100644 |
35 |
---- a/numpy/distutils/system_info.py |
36 |
-+++ b/numpy/distutils/system_info.py |
37 |
-@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0): |
38 |
- 1 - display warning message |
39 |
- 2 - raise error |
40 |
- """ |
41 |
-- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
42 |
-- 'atlas_threads': atlas_threads_info, # ditto |
43 |
-- 'atlas_blas': atlas_blas_info, |
44 |
-- 'atlas_blas_threads': atlas_blas_threads_info, |
45 |
-- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
46 |
-- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
47 |
-- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead |
48 |
-- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto |
49 |
-- 'atlas_3_10_blas': atlas_3_10_blas_info, |
50 |
-- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, |
51 |
-- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead |
52 |
-- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto |
53 |
-- 'flame': flame_info, # use lapack_opt instead |
54 |
-- 'mkl': mkl_info, |
55 |
-- # openblas which may or may not have embedded lapack |
56 |
-- 'openblas': openblas_info, # use blas_opt instead |
57 |
-- # openblas with embedded lapack |
58 |
-- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead |
59 |
-- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead |
60 |
-- 'blis': blis_info, # use blas_opt instead |
61 |
-- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
62 |
-- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
63 |
-+ cl = {'flame': flame_info, # use lapack_opt instead |
64 |
- 'accelerate': accelerate_info, # use blas_opt instead |
65 |
- 'x11': x11_info, |
66 |
- 'fft_opt': fft_opt_info, |
67 |
-@@ -796,10 +775,7 @@ class system_info(object): |
68 |
- return [b for b in [a.strip() for a in libs.split(',')] if b] |
69 |
- |
70 |
- def get_libraries(self, key='libraries'): |
71 |
-- if hasattr(self, '_lib_names'): |
72 |
-- return self.get_libs(key, default=self._lib_names) |
73 |
-- else: |
74 |
-- return self.get_libs(key, '') |
75 |
-+ return self.get_libs(key, '') |
76 |
- |
77 |
- def library_extensions(self): |
78 |
- c = customized_ccompiler() |
79 |
- |
80 |
|
81 |
diff --git a/dev-python/numpy/numpy-1.19.5.ebuild b/dev-python/numpy/numpy-1.19.5.ebuild |
82 |
deleted file mode 100644 |
83 |
index 181526f95b2..00000000000 |
84 |
--- a/dev-python/numpy/numpy-1.19.5.ebuild |
85 |
+++ /dev/null |
86 |
@@ -1,145 +0,0 @@ |
87 |
-# Copyright 1999-2021 Gentoo Authors |
88 |
-# Distributed under the terms of the GNU General Public License v2 |
89 |
- |
90 |
-EAPI=7 |
91 |
- |
92 |
-PYTHON_COMPAT=( python3_{7..9} ) |
93 |
-PYTHON_REQ_USE="threads(+)" |
94 |
- |
95 |
-FORTRAN_NEEDED=lapack |
96 |
- |
97 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
98 |
- |
99 |
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs |
100 |
- |
101 |
-DOC_PV="1.16.4" |
102 |
-DESCRIPTION="Fast array and numerical python library" |
103 |
-HOMEPAGE="https://numpy.org/" |
104 |
-SRC_URI=" |
105 |
- mirror://pypi/${PN:0:1}/${PN}/${P}.zip |
106 |
- doc? ( |
107 |
- https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip |
108 |
- https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf |
109 |
- https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf |
110 |
- )" |
111 |
-LICENSE="BSD" |
112 |
-SLOT="0" |
113 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
114 |
-IUSE="doc lapack" |
115 |
- |
116 |
-RDEPEND=" |
117 |
- lapack? ( |
118 |
- >=virtual/cblas-3.8 |
119 |
- >=virtual/lapack-3.8 |
120 |
- ) |
121 |
-" |
122 |
-BDEPEND=" |
123 |
- ${RDEPEND} |
124 |
- app-arch/unzip |
125 |
- >=dev-python/cython-0.29.21[${PYTHON_USEDEP}] |
126 |
- lapack? ( virtual/pkgconfig ) |
127 |
- test? ( |
128 |
- >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] |
129 |
- >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] |
130 |
- >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] |
131 |
- ) |
132 |
-" |
133 |
- |
134 |
-PATCHES=( |
135 |
- "${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch |
136 |
-) |
137 |
- |
138 |
-distutils_enable_tests pytest |
139 |
- |
140 |
-src_unpack() { |
141 |
- default |
142 |
- if use doc; then |
143 |
- unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die |
144 |
- fi |
145 |
-} |
146 |
- |
147 |
-python_prepare_all() { |
148 |
- if use lapack; then |
149 |
- local incdir="${EPREFIX}"/usr/include |
150 |
- local libdir="${EPREFIX}"/usr/$(get_libdir) |
151 |
- cat >> site.cfg <<-EOF || die |
152 |
- [blas] |
153 |
- include_dirs = ${incdir} |
154 |
- library_dirs = ${libdir} |
155 |
- blas_libs = cblas,blas |
156 |
- [lapack] |
157 |
- library_dirs = ${libdir} |
158 |
- lapack_libs = lapack |
159 |
- EOF |
160 |
- else |
161 |
- export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
162 |
- fi |
163 |
- |
164 |
- export CC="$(tc-getCC) ${CFLAGS}" |
165 |
- |
166 |
- append-flags -fno-strict-aliasing |
167 |
- |
168 |
- # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 |
169 |
- # with the subtle difference that we don't want to break Darwin where |
170 |
- # -shared is not a valid linker argument |
171 |
- if [[ ${CHOST} != *-darwin* ]]; then |
172 |
- append-ldflags -shared |
173 |
- fi |
174 |
- |
175 |
- # only one fortran to link with: |
176 |
- # linking with cblas and lapack library will force |
177 |
- # autodetecting and linking to all available fortran compilers |
178 |
- append-fflags -fPIC |
179 |
- if use lapack; then |
180 |
- NUMPY_FCONFIG="config_fc --noopt --noarch" |
181 |
- # workaround bug 335908 |
182 |
- [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
183 |
- fi |
184 |
- |
185 |
- # don't version f2py, we will handle it. |
186 |
- sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die |
187 |
- |
188 |
- # disable fuzzed tests |
189 |
- find numpy/*/tests -name '*.py' -exec sed -i \ |
190 |
- -e 's:def \(.*_fuzz\):def _\1:' {} + || die |
191 |
- # very memory- and disk-hungry |
192 |
- sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die |
193 |
- |
194 |
- distutils-r1_python_prepare_all |
195 |
-} |
196 |
- |
197 |
-python_compile() { |
198 |
- export MAKEOPTS=-j1 #660754 |
199 |
- |
200 |
- distutils-r1_python_compile ${NUMPY_FCONFIG} |
201 |
-} |
202 |
- |
203 |
-python_test() { |
204 |
- distutils_install_for_testing --single-version-externally-managed \ |
205 |
- --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} |
206 |
- |
207 |
- cd "${TMPDIR}" || die |
208 |
- |
209 |
- "${EPYTHON}" -c " |
210 |
-import numpy, sys |
211 |
-r = numpy.test(label='full', verbose=3) |
212 |
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" |
213 |
-} |
214 |
- |
215 |
-python_install() { |
216 |
- # https://github.com/numpy/numpy/issues/16005 |
217 |
- local mydistutilsargs=( build_src ) |
218 |
- distutils-r1_python_install ${NUMPY_FCONFIG} |
219 |
- python_optimize |
220 |
-} |
221 |
- |
222 |
-python_install_all() { |
223 |
- local DOCS=( LICENSE.txt README.md THANKS.txt ) |
224 |
- |
225 |
- if use doc; then |
226 |
- local HTML_DOCS=( "${WORKDIR}"/html/. ) |
227 |
- DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) |
228 |
- fi |
229 |
- |
230 |
- distutils-r1_python_install_all |
231 |
-} |