From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-python/numpy/Manifest | 9 +- .../numpy-1.21.4-build-compiler-args-ceph.patch | 49 +++++++ .../numpy/files/numpy-1.21.4-copy-python-3.9.patch | 52 +++++++ dev-python/numpy/numpy-1.21.2-r1.ebuild | 2 +- dev-python/numpy/numpy-1.21.3-r1.ebuild | 8 + dev-python/numpy/numpy-1.21.4-r2.ebuild | 162 +++++++++++++++++++++ dev-python/numpy/numpy-1.21.4.ebuild | 8 + 7 files changed, 286 insertions(+), 4 deletions(-) create mode 100644 dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch create mode 100644 dev-python/numpy/files/numpy-1.21.4-copy-python-3.9.patch create mode 100644 dev-python/numpy/numpy-1.21.4-r2.ebuild (limited to 'dev-python/numpy') diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index fb1f1e7b616b..ebd600111452 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,5 +1,7 @@ AUX numpy-1.21.0-no-hardcode-blasv2.patch 2671 BLAKE2B 78d7072241148874d746546ce50f7b451df4608aaf27bb469300893a0585b54f8da130e85995363b768d2dd3c8e6af10b106b3b2540ade2b53ec1a9c7b2c6e68 SHA512 f745f0e68ac6a8229b44b357a2cd45d7b606eef7e7ed43efea8d43cfd1f2670ba60cf145e9a34f858f266539164f97d7094b3b4abbd0a1bb79a5c1b2a979ae9a AUX numpy-1.21.3-unaligned-array.patch 1787 BLAKE2B cbc8e231e04582965d5ce60d285ec3e9c23a685b6c78f65e2d32e6b1a9e838653ae1d3f1ad5bf602159d1a63d5ee2347153df11d5aeeade6bbe2a39dd71c1388 SHA512 e0f410838a88c7c6892c972b8084ea5153453e90bd65922fb83772fca8052798173c9b450a1384032c39e9a82e91572cef39e4dc006d44def125debb404d0fd6 +AUX numpy-1.21.4-build-compiler-args-ceph.patch 2033 BLAKE2B 63aae1b73e41332d5179d822aeefd5da3289505e9d6f6d7755a34746af5506113fb81eaccc08f1582ac5820d6fb2a1d00ee4ba98ef482f4adc72c7288069c6d1 SHA512 ffad960980048603012c0d435013f0f3326a8ecd26eba8ad27c1287b3eb624733c53ddeb270108c1d26339fefc1cb8faaea233ec6e2ac7a072a023ddb12868d0 +AUX numpy-1.21.4-copy-python-3.9.patch 1698 BLAKE2B 7274c22c38820a01b02ed899f45afce95a3e5fda74f0417809caab1bf28c1e56348785c9209233ad46b00138606364548a80b5b4120b2d96f0a8cccda0d5187f SHA512 92635f37f4de7992cce2c96861fc28151fe5b6adb979db4b6a4ec456c8a84d58a8bf3ab612c1b83a5a507d96b4084d250c5d7855d245057f6977bc6a899f5a14 DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c SHA512 694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5 DIST numpy-1.21.2.zip 10264801 BLAKE2B 2d88506faa5bc767a16c000f201559917d800fd205c75f30c1e61d4b34e214b376da9876e96186914f9fe23bf033a305bf9212f593841407e3bf4e516b5982a6 SHA512 ad08110d9a73a73ef1a546de5fcd6dfe600c17b396f629c3a19ade7b3f226688cf7524fed78c035fd4ddda135e2bcf9facb5e061fb59640b424da2ed070c4184 DIST numpy-1.21.3.zip 10269351 BLAKE2B 60fc96d91e2c4e0b1c6ee409e02640686fe257f5addbb17229568f591551ea3c415c4aac97b7cdb161b88ce436e42a766b161bd5a82f8cb66fff6771c0097bd3 SHA512 8fbe4e8543b72ad5203d5b122eb3d875e48965682945898e54f4ce82cf790713dfd9185b8b12439aefa86bf25209ea25d04ec3ca2aa2b8d2f32d69358421b792 @@ -17,7 +19,8 @@ DIST numpy-user-1.21.2.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800 DIST numpy-user-1.21.3.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace DIST numpy-user-1.21.4.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace EBUILD numpy-1.21.1-r1.ebuild 3726 BLAKE2B c81ef764b3a069469783d3c005894bab1b552e1d638f3bf21692e8b3116d54e71bc5d0260112467427a0fd5a4172db950dae4679706fc503115c14ee13f2c387 SHA512 4ea551537644b20d252e5056bf8704ce872af0bdbd058be17b27f65225c1f8264ede22a8e06c754786322970ccdb7246cfae41e3ddb76287bba77882738f800e -EBUILD numpy-1.21.2-r1.ebuild 3721 BLAKE2B 28b9a634378c0173f255c3756975b32dd68fdf700f8f96846e1d7e727c31272b46d02f9dca3f76c852494dbce3b6f7296d035b85641333a4551b496b5252c0c8 SHA512 d3246d9bd9451f3d83f4025af22d11656ad0c7b37e9324d8d5acb4379e8aac0759a28299cf69f68e8b9211b464d33a0e986d40d32185fc1192720433598f8ea9 -EBUILD numpy-1.21.3-r1.ebuild 3716 BLAKE2B 2f47bf2dee1172e6aae91d8945ecc5067f795919c27465324b89b7d967f64c01a533cab1683259c92328682db055811b8f3da6f29c1ac4ed02d1ab05a2471c92 SHA512 5e0148cd7e35d81275e481890de5287f5b03fecac044e1eb46a73fbcedc95d7f12480433c977b66a3f83b57fd09eb506945efc3746b14e594fb643a405811ed9 -EBUILD numpy-1.21.4.ebuild 3674 BLAKE2B 7a24b18b16e2b689b8a2a3e366d50674751f792047d05576ee62daea80d2307bce2238279b40be9d23e726c1ea9f426a2fe97a6c4ec87ede7f34030a4abe71c8 SHA512 f11faf401727486dd69d1ca82d2ffc83bf5b02cff917f0d54130beb52cf5569346eed1ba9485fe45d1dd28b443525053788773bbfa96305b9fe6bf286dc9abf8 +EBUILD numpy-1.21.2-r1.ebuild 3716 BLAKE2B 5e3358ef575cc4eb830f6ff0463250278581c7aeb370d10e283bdb4abc410190149709c9e28257f8683e54cb8f1cf221164607c1681b397af90f125565820c47 SHA512 0cba076a427f2d93387f176287de7c7cec07bcfc698532366221810e6aa4040a84006b420718276441c9d96b7a73d7bf474a91c746eb437b49fdca9ec49ffcc6 +EBUILD numpy-1.21.3-r1.ebuild 3944 BLAKE2B 8c946e32d5743994a702b6887929b4709c462af2524d0f179390866496fb449d6728574f184c768c37b1431b175bf64a1f847746ac691b36868cfe2688599f7e SHA512 a323dd2db55634826d6ded1448e7f43eb56ca7ab453746fef8ad9f85200e3de690109389485026c608b1e8931fbe58b929e5f29f4681fc47dba98b07e758223e +EBUILD numpy-1.21.4-r2.ebuild 4300 BLAKE2B 57d1e35b092af83be85ea6983b9bd9e167f7abf727f7067d2472a8bf60183f6976db3610e74c0deec77af9bdad2a79648346db6f6df5676cf6b0d194047e589f SHA512 e3857a12a4878b1e0327878d91a6d6b891b00b97a61c6d11588b7508bb135b800543fc7afc107de3eecd92cc283983ee90d0de5d6b5445a34388c8f0aa84ba75 +EBUILD numpy-1.21.4.ebuild 3902 BLAKE2B 52a370dc3c788eb51782b27c451ea5b96777f4cb1bb54d239bcdd807d5d944790429b904ccef1c7b131ad59ba61584c01903dffce06b899b0eb07e01e98e7af9 SHA512 ff3c0a57f5d3b7b2f74c4cb76fc6e39f045531ab754ac83c07894e3b71944f4e2c938a288227139073f5b495b14ba9c85c3ef8de321755509856a29bcd710fb6 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390 diff --git a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch b/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch new file mode 100644 index 000000000000..6a31d2efe970 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch @@ -0,0 +1,49 @@ +https://github.com/numpy/numpy/commit/689d905f501b7abbddf0fdef241fa586a83e5cd6 +https://github.com/numpy/numpy/pull/20116 +https://bugs.gentoo.org/802150 + +From 7dcf62379f41407d8f9583d1c2016e3d8ec48384 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Thu, 14 Oct 2021 14:58:52 +0900 +Subject: [PATCH] MAINT: Fix issue with C compiler args containing spaces + +Instead of doing a dumb string split, use shlex to make sure args +containing spaces are handled properly. +--- + numpy/distutils/unixccompiler.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py +index 733a9fc5094..4884960fdf2 100644 +--- a/numpy/distutils/unixccompiler.py ++++ b/numpy/distutils/unixccompiler.py +@@ -5,6 +5,7 @@ + import os + import sys + import subprocess ++import shlex + + from distutils.errors import CompileError, DistutilsExecError, LibError + from distutils.unixccompiler import UnixCCompiler +@@ -30,15 +31,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts + if 'OPT' in os.environ: + # XXX who uses this? + from sysconfig import get_config_vars +- opt = " ".join(os.environ['OPT'].split()) +- gcv_opt = " ".join(get_config_vars('OPT')[0].split()) +- ccomp_s = " ".join(self.compiler_so) ++ opt = shlex.join(shlex.split(os.environ['OPT'])) ++ gcv_opt = shlex.join(shlex.split(get_config_vars('OPT')[0])) ++ ccomp_s = shlex.join(self.compiler_so) + if opt not in ccomp_s: + ccomp_s = ccomp_s.replace(gcv_opt, opt) +- self.compiler_so = ccomp_s.split() +- llink_s = " ".join(self.linker_so) ++ self.compiler_so = shlex.split(ccomp_s) ++ llink_s = shlex.join(self.linker_so) + if opt not in llink_s: +- self.linker_so = llink_s.split() + opt.split() ++ self.linker_so = self.linker_so + shlex.split(opt) + + display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) + diff --git a/dev-python/numpy/files/numpy-1.21.4-copy-python-3.9.patch b/dev-python/numpy/files/numpy-1.21.4-copy-python-3.9.patch new file mode 100644 index 000000000000..81464151e753 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.21.4-copy-python-3.9.patch @@ -0,0 +1,52 @@ +https://github.com/numpy/numpy/commit/50823973e857363f7d8052768276c2e86f004d61 +https://github.com/numpy/numpy/pull/20357 + +From: Bas van Beek +Date: Wed, 10 Nov 2021 15:36:00 +0100 +Subject: [PATCH] MAINT: Do not forward `__(deep)copy__` calls of + `_GenericAlias` to the wrapped type + +Adapt to the python 3.9.8 changes made in bpo-45167. +--- a/numpy/typing/_generic_alias.py ++++ b/numpy/typing/_generic_alias.py +@@ -178,6 +178,8 @@ def __eq__(self, value: object) -> bool: + "__mro_entries__", + "__reduce__", + "__reduce_ex__", ++ "__copy__", ++ "__deepcopy__", + }) + + def __getattribute__(self, name: str) -> Any: +--- a/numpy/typing/tests/test_generic_alias.py ++++ b/numpy/typing/tests/test_generic_alias.py +@@ -1,6 +1,7 @@ + from __future__ import annotations + + import sys ++import copy + import types + import pickle + import weakref +@@ -74,6 +75,21 @@ def test_pass(self, name: str, func: FuncType) -> None: + value_ref = func(NDArray_ref) + assert value == value_ref + ++ @pytest.mark.parametrize("name,func", [ ++ ("__copy__", lambda n: n == copy.copy(n)), ++ ("__deepcopy__", lambda n: n == copy.deepcopy(n)), ++ ]) ++ def test_copy(self, name: str, func: FuncType) -> None: ++ value = func(NDArray) ++ ++ # xref bpo-45167 ++ GE_398 = ( ++ sys.version_info[:2] == (3, 9) and sys.version_info >= (3, 9, 8) ++ ) ++ if GE_398 or sys.version_info >= (3, 10, 1): ++ value_ref = func(NDArray_ref) ++ assert value == value_ref ++ + def test_weakref(self) -> None: + """Test ``__weakref__``.""" + value = weakref.ref(NDArray)() diff --git a/dev-python/numpy/numpy-1.21.2-r1.ebuild b/dev-python/numpy/numpy-1.21.2-r1.ebuild index 43d5088c7985..6d183c01e49b 100644 --- a/dev-python/numpy/numpy-1.21.2-r1.ebuild +++ b/dev-python/numpy/numpy-1.21.2-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI=" )" LICENSE="BSD" SLOT="0" -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" +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" IUSE="doc lapack" RDEPEND=" diff --git a/dev-python/numpy/numpy-1.21.3-r1.ebuild b/dev-python/numpy/numpy-1.21.3-r1.ebuild index d9b1d09193dd..514a34b8e87a 100644 --- a/dev-python/numpy/numpy-1.21.3-r1.ebuild +++ b/dev-python/numpy/numpy-1.21.3-r1.ebuild @@ -118,6 +118,14 @@ python_test() { numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py] ) + if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then + # Degenerate case. arm32 chroot on arm64. + # bug #774108 + deselect+=( + numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features + ) + fi + distutils_install_for_testing --single-version-externally-managed \ --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} diff --git a/dev-python/numpy/numpy-1.21.4-r2.ebuild b/dev-python/numpy/numpy-1.21.4-r2.ebuild new file mode 100644 index 000000000000..c692fa77e87c --- /dev/null +++ b/dev-python/numpy/numpy-1.21.4-r2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+)" + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs + +DOC_PV=${PV} +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="https://numpy.org/" +SRC_URI=" + mirror://pypi/${PN:0:1}/${PN}/${P}.zip + doc? ( + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf + )" +LICENSE="BSD" +SLOT="0" +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" +IUSE="doc lapack" + +RDEPEND=" + lapack? ( + >=virtual/cblas-3.8 + >=virtual/lapack-3.8 + ) +" +BDEPEND=" + ${RDEPEND} + app-arch/unzip + >=dev-python/cython-0.29.24[${PYTHON_USEDEP}] + lapack? ( virtual/pkgconfig ) + test? ( + >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] + >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] + >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch + "${FILESDIR}"/numpy-1.21.4-build-compiler-args-ceph.patch + "${FILESDIR}"/numpy-1.21.4-copy-python-3.9.patch +) + +distutils_enable_tests pytest + +src_unpack() { + default + if use doc; then + unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die + fi +} + +python_prepare_all() { + if use lapack; then + local incdir="${EPREFIX}"/usr/include + local libdir="${EPREFIX}"/usr/$(get_libdir) + cat >> site.cfg <<-EOF || die + [blas] + include_dirs = ${incdir} + library_dirs = ${libdir} + blas_libs = cblas,blas + [lapack] + library_dirs = ${libdir} + lapack_libs = lapack + EOF + else + export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None + fi + + export CC="$(tc-getCC) ${CFLAGS}" + + append-flags -fno-strict-aliasing + + # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 + # with the subtle difference that we don't want to break Darwin where + # -shared is not a valid linker argument + if [[ ${CHOST} != *-darwin* ]]; then + append-ldflags -shared + fi + + # only one fortran to link with: + # linking with cblas and lapack library will force + # autodetecting and linking to all available fortran compilers + append-fflags -fPIC + if use lapack; then + NUMPY_FCONFIG="config_fc --noopt --noarch" + # workaround bug 335908 + [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" + fi + + # don't version f2py, we will handle it. + sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die + + # disable fuzzed tests + find numpy/*/tests -name '*.py' -exec sed -i \ + -e 's:def \(.*_fuzz\):def _\1:' {} + || die + # very memory- and disk-hungry + sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + export MAKEOPTS=-j1 #660754 + + distutils-r1_python_compile ${NUMPY_FCONFIG} +} + +python_test() { + local deselect=( + numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py] + ) + + if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then + # Degenerate case. arm32 chroot on arm64. + # bug #774108 + deselect+=( + numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features + ) + fi + + if use x86 ; then + deselect+=( + # https://github.com/numpy/numpy/issues/18388 + numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow + # https://github.com/numpy/numpy/issues/18387 + numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto + ) + fi + + distutils_install_for_testing --single-version-externally-managed \ + --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} + + cd "${TEST_DIR}/lib" || die + epytest ${deselect[@]/#/--deselect } +} + +python_install() { + # https://github.com/numpy/numpy/issues/16005 + local mydistutilsargs=( build_src ) + distutils-r1_python_install ${NUMPY_FCONFIG} + python_optimize +} + +python_install_all() { + local DOCS=( LICENSE.txt README.md THANKS.txt ) + + if use doc; then + local HTML_DOCS=( "${WORKDIR}"/html/. ) + DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) + fi + + distutils-r1_python_install_all +} diff --git a/dev-python/numpy/numpy-1.21.4.ebuild b/dev-python/numpy/numpy-1.21.4.ebuild index cd54f4bc4a63..114e5f17f876 100644 --- a/dev-python/numpy/numpy-1.21.4.ebuild +++ b/dev-python/numpy/numpy-1.21.4.ebuild @@ -117,6 +117,14 @@ python_test() { numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py] ) + if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then + # Degenerate case. arm32 chroot on arm64. + # bug #774108 + deselect+=( + numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features + ) + fi + distutils_install_for_testing --single-version-externally-managed \ --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} -- cgit v1.2.3