mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-python/numpy: drop 1.23.1
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,16 +1,12 @@
|
||||
DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
|
||||
DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7 SHA512 b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
|
||||
DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
|
||||
DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09 SHA512 727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
|
||||
DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
|
||||
DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
|
||||
DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
|
||||
DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
|
||||
DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
|
||||
DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
|
||||
DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
|
||||
DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
|
||||
DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
|
||||
DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
|
||||
DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
|
||||
DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
|
||||
https://bugs.gentoo.org/567938
|
||||
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
||||
index 82e864a5c..1d77e5854 100644
|
||||
--- a/numpy/distutils/system_info.py
|
||||
+++ b/numpy/distutils/system_info.py
|
||||
@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0):
|
||||
1 - display warning message
|
||||
2 - raise error
|
||||
"""
|
||||
- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
|
||||
- 'atlas_threads': atlas_threads_info, # ditto
|
||||
- 'atlas_blas': atlas_blas_info,
|
||||
- 'atlas_blas_threads': atlas_blas_threads_info,
|
||||
- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
|
||||
- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
|
||||
- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
|
||||
- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
|
||||
- 'atlas_3_10_blas': atlas_3_10_blas_info,
|
||||
- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
|
||||
- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
|
||||
- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
|
||||
- 'flame': flame_info, # use lapack_opt instead
|
||||
- 'mkl': mkl_info,
|
||||
- # openblas which may or may not have embedded lapack
|
||||
- 'openblas': openblas_info, # use blas_opt instead
|
||||
- # openblas with embedded lapack
|
||||
- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
|
||||
- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead
|
||||
- 'blis': blis_info, # use blas_opt instead
|
||||
- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
|
||||
- 'blas_mkl': blas_mkl_info, # use blas_opt instead
|
||||
- 'accelerate': accelerate_info, # use blas_opt instead
|
||||
- 'openblas64_': openblas64__info,
|
||||
- 'openblas64__lapack': openblas64__lapack_info,
|
||||
- 'openblas_ilp64': openblas_ilp64_info,
|
||||
- 'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
|
||||
+ cl = {'flame': flame_info, # use lapack_opt instead
|
||||
'x11': x11_info,
|
||||
'fft_opt': fft_opt_info,
|
||||
'fftw': fftw_info,
|
||||
@@ -947,10 +921,7 @@ def get_libs(self, key, default):
|
||||
return [b for b in [a.strip() for a in libs.split(',')] if b]
|
||||
|
||||
def get_libraries(self, key='libraries'):
|
||||
- if hasattr(self, '_lib_names'):
|
||||
- return self.get_libs(key, default=self._lib_names)
|
||||
- else:
|
||||
- return self.get_libs(key, '')
|
||||
+ return self.get_libs(key, '')
|
||||
|
||||
def library_extensions(self):
|
||||
c = customized_ccompiler()
|
||||
@@ -1,49 +0,0 @@
|
||||
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 <marcan@marcan.st>
|
||||
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)
|
||||
|
||||
@@ -1,192 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..11} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
FORTRAN_NEEDED=lapack
|
||||
|
||||
inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
|
||||
|
||||
DOC_PV=${PV}
|
||||
# For when docs aren't ready yet, set to last version
|
||||
#DOC_PV=1.23.0
|
||||
DESCRIPTION="Fast array and numerical python library"
|
||||
HOMEPAGE="
|
||||
https://numpy.org/
|
||||
https://github.com/numpy/numpy/
|
||||
https://pypi.org/project/numpy/
|
||||
"
|
||||
SRC_URI="
|
||||
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
|
||||
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 ~loong ~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}
|
||||
>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
|
||||
lapack? (
|
||||
virtual/pkgconfig
|
||||
)
|
||||
doc? (
|
||||
app-arch/unzip
|
||||
)
|
||||
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.22.0-no-hardcode-blasv2.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() {
|
||||
# Allow use with setuptools 60.x
|
||||
# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
|
||||
export SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||
|
||||
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
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
export MAKEOPTS=-j1 #660754
|
||||
|
||||
distutils-r1_python_compile ${NUMPY_FCONFIG}
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local EPYTEST_DESELECT=(
|
||||
# very disk- and memory-hungry
|
||||
numpy/lib/tests/test_io.py::test_large_zip
|
||||
|
||||
# precision problems
|
||||
numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
|
||||
|
||||
# runs the whole test suite recursively, that's just crazy
|
||||
numpy/core/tests/test_mem_policy.py::test_new_policy
|
||||
|
||||
# very slow, unlikely to be practically useful
|
||||
numpy/typing/tests/test_typing.py
|
||||
)
|
||||
|
||||
if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
|
||||
# Degenerate case. arm32 chroot on arm64.
|
||||
# bug #774108
|
||||
EPYTEST_DESELECT+=(
|
||||
numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
|
||||
)
|
||||
fi
|
||||
|
||||
if use x86 ; then
|
||||
EPYTEST_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
|
||||
# more precision problems
|
||||
numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
|
||||
)
|
||||
fi
|
||||
if use arm || use x86 ; then
|
||||
EPYTEST_DESELECT+=(
|
||||
# too large for 32-bit platforms
|
||||
numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
|
||||
)
|
||||
fi
|
||||
|
||||
[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
|
||||
# known problem
|
||||
'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
|
||||
)
|
||||
|
||||
distutils_install_for_testing --single-version-externally-managed \
|
||||
--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
|
||||
|
||||
cd "${TEST_DIR}/lib" || die
|
||||
epytest -k "not _fuzz"
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user