Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/, dev-python/numpy/
Date: Fri, 14 Jan 2022 20:33:03
Message-Id: 1642192367.6e99b3b25a0a1bdd5b706e494b4cedb044f101fe.sam@gentoo
1 commit: 6e99b3b25a0a1bdd5b706e494b4cedb044f101fe
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 14 20:32:47 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 14 20:32:47 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e99b3b2
7
8 dev-python/numpy: add 1.22.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-python/numpy/Manifest | 1 +
13 ...umpy-1.22.1-revert-setuptools-upper-bound.patch | 22 +++
14 dev-python/numpy/numpy-1.22.1.ebuild | 167 +++++++++++++++++++++
15 3 files changed, 190 insertions(+)
16
17 diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
18 index 993f73add007..ee195e3420ad 100644
19 --- a/dev-python/numpy/Manifest
20 +++ b/dev-python/numpy/Manifest
21 @@ -4,6 +4,7 @@ DIST numpy-1.21.3.zip 10269351 BLAKE2B 60fc96d91e2c4e0b1c6ee409e02640686fe257f5a
22 DIST numpy-1.21.4.zip 10646392 BLAKE2B 6e2953c6ca8e35c99f5de5faaacfb2b76b351a5c9521ba27449fcdeca5614978ff7d71fc52ce3787d1c7506c4e8eb81b1a92d3bf6825de1cb1d304ea4de83820 SHA512 85575a009bf40a8e5acaaa949d2669545968825df34273e367c42af36fa882ebb0830ff7953b5617d34d3061b3877238524937c42470fac9464479dc33ae60ce
23 DIST numpy-1.21.5.zip 10652289 BLAKE2B c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c SHA512 03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
24 DIST numpy-1.22.0.zip 11291139 BLAKE2B 91cd2188aaa59d7be18761b74865295f400e309e34bf79067493221c5f0eb875a5c726dd8e322db84fa9714800347954b6a9896aadf914e87872497f7e65527c SHA512 dcea1a6cd257f6353caccc30b2adb1cf2e9d52191ec9f968839c85b1f776ebf8c5ac8bbf0751c2c6f292ae671e4006d26eb06691ca1504e4d65baf4cec3f9803
25 +DIST numpy-1.22.1.zip 11443674 BLAKE2B 3f2e5fbd449c078fd97670be14e87fd9bccc8418dc37f87199557642f0f951f5fd21b89eff938c30171eda3174c526db91e470e9e9cdc297b8abd9b4fe364ad5 SHA512 0d8b5ffb6f8377b3d6d6cb62fd7eef083f8a3b787542b7887e0d214c6fa78b63b6f726302bca554c0c11c57e4611926c8d8ff4abf5dd59842b8b58086391434d
26 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
27 DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
28 DIST numpy-html-1.21.2.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
29
30 diff --git a/dev-python/numpy/files/numpy-1.22.1-revert-setuptools-upper-bound.patch b/dev-python/numpy/files/numpy-1.22.1-revert-setuptools-upper-bound.patch
31 new file mode 100644
32 index 000000000000..a2bc9c939aea
33 --- /dev/null
34 +++ b/dev-python/numpy/files/numpy-1.22.1-revert-setuptools-upper-bound.patch
35 @@ -0,0 +1,22 @@
36 +Revert https://github.com/numpy/numpy/commit/eb6be7c4765665724cd12431bfefb050ba0f2d4b.
37 +
38 +See also:
39 +https://github.com/pypa/setuptools/issues/2372
40 +https://github.com/numpy/numpy/issues/20692
41 +
42 +In the ebuild, we're forcing SETUPTOOLS_USE_DISTUTILS=stdlib which uses
43 +the distutils version from within Python (which will be removed in 3.11)
44 +rather than the bundled-in-setuptools-60 version which breaks numpy.
45 +--- a/setup.py
46 ++++ b/setup.py
47 +@@ -80,10 +80,6 @@ if os.path.exists('MANIFEST'):
48 + # so that it is in sys.modules
49 + import numpy.distutils.command.sdist
50 + import setuptools
51 +-if int(setuptools.__version__.split('.')[0]) >= 60:
52 +- raise RuntimeError(
53 +- "Setuptools version is '{}', version < '60.0.0' is required. "
54 +- "See pyproject.toml".format(setuptools.__version__))
55 +
56 + # Initialize cmdclass from versioneer
57 + from numpy.distutils.core import numpy_cmdclass
58
59 diff --git a/dev-python/numpy/numpy-1.22.1.ebuild b/dev-python/numpy/numpy-1.22.1.ebuild
60 new file mode 100644
61 index 000000000000..485fd90e0cdf
62 --- /dev/null
63 +++ b/dev-python/numpy/numpy-1.22.1.ebuild
64 @@ -0,0 +1,167 @@
65 +# Copyright 1999-2022 Gentoo Authors
66 +# Distributed under the terms of the GNU General Public License v2
67 +
68 +EAPI=7
69 +
70 +PYTHON_COMPAT=( python3_{8..10} )
71 +PYTHON_REQ_USE="threads(+)"
72 +
73 +FORTRAN_NEEDED=lapack
74 +
75 +inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
76 +
77 +# Not ready yet
78 +#DOC_PV=${PV}
79 +DOC_PV=1.21.0
80 +DESCRIPTION="Fast array and numerical python library"
81 +HOMEPAGE="https://numpy.org/"
82 +SRC_URI="
83 + mirror://pypi/${PN:0:1}/${PN}/${P}.zip
84 + doc? (
85 + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
86 + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
87 + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
88 + )"
89 +LICENSE="BSD"
90 +SLOT="0"
91 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
92 +IUSE="doc lapack"
93 +
94 +RDEPEND="
95 + lapack? (
96 + >=virtual/cblas-3.8
97 + >=virtual/lapack-3.8
98 + )
99 +"
100 +BDEPEND="
101 + ${RDEPEND}
102 + app-arch/unzip
103 + >=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
104 + lapack? ( virtual/pkgconfig )
105 + test? (
106 + >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
107 + >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
108 + >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
109 + )
110 +"
111 +
112 +PATCHES=(
113 + "${FILESDIR}"/${PN}-1.22.0-no-hardcode-blasv2.patch
114 + "${FILESDIR}"/${PN}-1.22.1-revert-setuptools-upper-bound.patch
115 +)
116 +
117 +distutils_enable_tests pytest
118 +
119 +src_unpack() {
120 + default
121 + if use doc; then
122 + unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
123 + fi
124 +}
125 +
126 +python_prepare_all() {
127 + # Allow use with setuptools 60.x
128 + # See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
129 + export SETUPTOOLS_USE_DISTUTILS=stdlib
130 +
131 + if use lapack; then
132 + local incdir="${EPREFIX}"/usr/include
133 + local libdir="${EPREFIX}"/usr/$(get_libdir)
134 + cat >> site.cfg <<-EOF || die
135 + [blas]
136 + include_dirs = ${incdir}
137 + library_dirs = ${libdir}
138 + blas_libs = cblas,blas
139 + [lapack]
140 + library_dirs = ${libdir}
141 + lapack_libs = lapack
142 + EOF
143 + else
144 + export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
145 + fi
146 +
147 + export CC="$(tc-getCC) ${CFLAGS}"
148 +
149 + append-flags -fno-strict-aliasing
150 +
151 + # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
152 + # with the subtle difference that we don't want to break Darwin where
153 + # -shared is not a valid linker argument
154 + if [[ ${CHOST} != *-darwin* ]]; then
155 + append-ldflags -shared
156 + fi
157 +
158 + # only one fortran to link with:
159 + # linking with cblas and lapack library will force
160 + # autodetecting and linking to all available fortran compilers
161 + append-fflags -fPIC
162 + if use lapack; then
163 + NUMPY_FCONFIG="config_fc --noopt --noarch"
164 + # workaround bug 335908
165 + [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
166 + fi
167 +
168 + # don't version f2py, we will handle it.
169 + sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
170 +
171 + # disable fuzzed tests
172 + find numpy/*/tests -name '*.py' -exec sed -i \
173 + -e 's:def \(.*_fuzz\):def _\1:' {} + || die
174 + # very memory- and disk-hungry
175 + sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
176 +
177 + distutils-r1_python_prepare_all
178 +}
179 +
180 +python_compile() {
181 + export MAKEOPTS=-j1 #660754
182 +
183 + distutils-r1_python_compile ${NUMPY_FCONFIG}
184 +}
185 +
186 +python_test() {
187 + local deselect=(
188 + numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
189 + )
190 +
191 + if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
192 + # Degenerate case. arm32 chroot on arm64.
193 + # bug #774108
194 + deselect+=(
195 + numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
196 + )
197 + fi
198 +
199 + if use x86 ; then
200 + deselect+=(
201 + # https://github.com/numpy/numpy/issues/18388
202 + numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
203 + # https://github.com/numpy/numpy/issues/18387
204 + numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
205 + )
206 + fi
207 +
208 + distutils_install_for_testing --single-version-externally-managed \
209 + --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
210 +
211 + cd "${TEST_DIR}/lib" || die
212 + epytest ${deselect[@]/#/--deselect }
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 +}