git: d3e0e547ee3b - main - math/py-numpy: Update to 1.26.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Jun 2024 14:23:50 UTC
The branch main has been updated by wen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d3e0e547ee3bfaa37aa10132d6fee0ed689333b6
commit d3e0e547ee3bfaa37aa10132d6fee0ed689333b6
Author: Wen Heping <wen@FreeBSD.org>
AuthorDate: 2024-06-15 14:21:25 +0000
Commit: Wen Heping <wen@FreeBSD.org>
CommitDate: 2024-06-15 14:23:11 +0000
math/py-numpy: Update to 1.26.4
PR: 277689
Reported by: wen@
Exp-run by: antoine@
---
Mk/Uses/python.mk | 2 +-
devel/py-numba/Makefile | 4 ++--
math/py-numpy/Makefile | 14 ++++++--------
math/py-numpy/distinfo | 12 +++++-------
...y-f2py-f2py2e.py => patch-numpy_f2py_f2py2e.py} | 22 +++++++++++-----------
5 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index d71ee26d8dc0..4a3f21b71641 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -819,7 +819,7 @@ CMAKE_ARGS+= -DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
# Python 3rd-party modules
PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
-PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.26,1:math/py-numpy@${PY_FLAVOR}
+PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.27,1:math/py-numpy@${PY_FLAVOR}
. if defined(_PYTHON_FEATURE_DISTUTILS)
. if ${PYTHON_MAJOR_VER} < 3
diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile
index 5c72c8c41821..3cc24400a823 100644
--- a/devel/py-numba/Makefile
+++ b/devel/py-numba/Makefile
@@ -18,12 +18,12 @@ BROKEN= requires OpenMP support that is missing on this architecture
# numpy version is checked at runtime
# https://github.com/numba/numba/blob/main/numba/__init__.py#L13
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1<=1.26,1:math/py-numpy@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1<=1.27,1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR}
LIB_DEPENDS= libtbb.so:devel/onetbb
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.31.0:devel/py-llvmlite@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1<=1.26,1:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1<=1.27,1:math/py-numpy@${PY_FLAVOR} \
USES= compiler:c++11-lang python fortran localbase
USE_PYTHON= distutils concurrent autoplist unittest
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 638e793f3a50..4f322bd86aae 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,14 +1,12 @@
PORTNAME= numpy
-PORTVERSION= 1.25.0
-PORTREVISION= 7
+PORTVERSION= 1.26.4
PORTEPOCH= 1
CATEGORIES= math python
MASTER_SITES= PYPI \
- https://numpy.org/doc/1.23/:doc
+ https://numpy.org/doc/1.26/:doc
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${PORTNAME}-ref.pdf:doc \
- ${PORTNAME}-user.pdf:doc
+ ${PORTNAME}-html.zip:doc
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION:R}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -22,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR}
-USES= compiler:c11 cpe fortran python:3.9-3.11
+USES= compiler:c11 cpe fortran python:3.9+
USE_PYTHON= allflavors autoplist concurrent cython distutils
GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
@@ -71,8 +69,8 @@ post-install:
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}-ref.pdf ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}-user.pdf ${STAGEDIR}${DOCSDIR}
+ ${UNZIP_NATIVE_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/numpy-html.zip -d ${STAGEDIR}${DOCSDIR}
+ @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 2de2617b8244..7e109d8c5f43 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1688388955
-SHA256 (numpy-1.25/numpy-1.25.0.tar.gz) = f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19
-SIZE (numpy-1.25/numpy-1.25.0.tar.gz) = 10426700
-SHA256 (numpy-1.25/numpy-ref.pdf) = f493c1cae879a4e0038bec400d349fc34aafa164e1462118bdf18b25a3a07daf
-SIZE (numpy-1.25/numpy-ref.pdf) = 7715485
-SHA256 (numpy-1.25/numpy-user.pdf) = 3978da15c6a1b00f2737c75458db0cc0fe636ae90b72723a8ff609d40e9b7599
-SIZE (numpy-1.25/numpy-user.pdf) = 4123384
+TIMESTAMP = 1718154974
+SHA256 (numpy-1.26/numpy-1.26.4.tar.gz) = 2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010
+SIZE (numpy-1.26/numpy-1.26.4.tar.gz) = 15786129
+SHA256 (numpy-1.26/numpy-html.zip) = 1dc88fc45a7709143b7b917e8e807e4985c41fe3fb7ee5fc55c3aeec5f369fdd
+SIZE (numpy-1.26/numpy-html.zip) = 25538887
diff --git a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py b/math/py-numpy/files/patch-numpy_f2py_f2py2e.py
similarity index 50%
rename from math/py-numpy/files/patch-numpy-f2py-f2py2e.py
rename to math/py-numpy/files/patch-numpy_f2py_f2py2e.py
index 762edb7c74c7..6cdc7b44718a 100644
--- a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
+++ b/math/py-numpy/files/patch-numpy_f2py_f2py2e.py
@@ -1,18 +1,18 @@
---- numpy/f2py/f2py2e.py.orig 2019-01-31 02:31:08 UTC
+--- numpy/f2py/f2py2e.py.orig 2024-06-12 01:22:27 UTC
+++ numpy/f2py/f2py2e.py
-@@ -599,6 +599,7 @@ def run_compile():
- include_dirs, sources = filter_files('-I', '', sources, remove_prefix=1)
+@@ -693,6 +693,7 @@ def run_compile():
+ extra_objects, sources = filter_files('', '[.](o|a|so|dylib)', sources)
library_dirs, sources = filter_files('-L', '', sources, remove_prefix=1)
libraries, sources = filter_files('-l', '', sources, remove_prefix=1)
+ extra_link_args, sources = filter_files('-Wl,|-B|-f','',sources,remove_prefix=0)
undef_macros, sources = filter_files('-U', '', sources, remove_prefix=1)
define_macros, sources = filter_files('-D', '', sources, remove_prefix=1)
for i in range(len(define_macros)):
-@@ -625,6 +626,7 @@ def run_compile():
- 'undef_macros': undef_macros,
- 'extra_objects': extra_objects,
- 'f2py_options': f2py_flags,
-+ 'extra_link_args': extra_link_args,
- }
-
- if sysinfo_flags:
+@@ -727,6 +728,7 @@ def run_compile():
+ define_macros,
+ undef_macros,
+ f2py_flags,
++ extra_link_args,
+ sysinfo_flags,
+ fc_flags,
+ flib_flags,