CVS commit: [pkgsrc-2023Q4] pkgsrc/math/py-numpy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: [pkgsrc-2023Q4] pkgsrc/math/py-numpy
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Fri, 19 Jan 2024 20:15:33 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Jan 19 20:15:33 UTC 2024

Modified Files:
        pkgsrc/math/py-numpy [pkgsrc-2023Q4]: Makefile PLIST distinfo
Added Files:
        pkgsrc/math/py-numpy/patches [pkgsrc-2023Q4]:
            patch-numpy_core_code__generators_generate__numpy__api.py
            patch-numpy_core_code__generators_generate__ufunc__api.py

Log Message:
Pullup ticket #6834 - requested by wiz
math/py-numpy: Python 3.12 build fix

(via patch)

Revisions pulled up:
- math/py-numpy/Makefile                                  1.117-1.119
- math/py-numpy/PLIST                                     1.46
- math/py-numpy/distinfo                                  1.87-1.88
- math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py
                                                          1.1
- math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py
                                                          1.1


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.116.2.1 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.45 -r1.45.2.1 pkgsrc/math/py-numpy/PLIST
cvs rdiff -u -r1.86 -r1.86.2.1 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py \
    pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.116 pkgsrc/math/py-numpy/Makefile:1.116.2.1
--- pkgsrc/math/py-numpy/Makefile:1.116 Thu Dec  7 20:45:56 2023
+++ pkgsrc/math/py-numpy/Makefile       Fri Jan 19 20:15:33 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2023/12/07 20:45:56 thor Exp $
+# $NetBSD: Makefile,v 1.116.2.1 2024/01/19 20:15:33 bsiegert Exp $
 
-DISTNAME=      numpy-1.26.2
-PKGREVISION=   1
+DISTNAME=      numpy-1.26.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
@@ -67,10 +66,12 @@ LDFLAGS+=           ${_COMPILER_ABI_FLAG.${ABI}}
 # TODO: accelerate.framework has no pkg-config yet (see blas.buildlink3.mk).
 BLAS_ACCEPTED=         ${_BLAS_TYPES}
 BLAS_C_INTERFACE=      yes
-# Yes, cblas and lapack API (not lapacke) is desired.
+# Cblas and lapack API (not lapacke) is desired.
 # Meson build uses pkg-config since 1.26.2 (or elaborate own logic not
-# suitable here).
-WHEEL_ARGS+=           -Csetup-args=-Dblas=${CBLAS_PC}
+# suitable here) and guesses for cblas if blas lib does not contain the
+# C interface. That covers netlib for us, and openblas builds serve
+# all APIs.
+WHEEL_ARGS+=           -Csetup-args=-Dblas=${BLAS_PC}
 WHEEL_ARGS+=           -Csetup-args=-Dlapack=${LAPACK_PC}
 
 # Remove invalid __STDC_VERSION__ setting
@@ -79,7 +80,14 @@ BUILDLINK_TRANSFORM.SunOS+=  rm:-D__STDC_
 pre-configure:
        ${LN} -sf ${PREFIX}/bin/cython-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/cython
 
+# Files don't exist with Python 3.12, so add '-f' to ${RM}
+# (Please check if this is still necessary after updates.)
 post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/command/config.py.orig
+       ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/__init__.py.orig
+       ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/g95.py.orig
+       ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/gnu.py.orig
+       ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/log.py.orig
        cd ${DESTDIR}${PREFIX}/bin && ${MV} f2py f2py-${PYVERSSUFFIX} || ${TRUE}
 
 # as of 1.26.1

Index: pkgsrc/math/py-numpy/PLIST
diff -u pkgsrc/math/py-numpy/PLIST:1.45 pkgsrc/math/py-numpy/PLIST:1.45.2.1
--- pkgsrc/math/py-numpy/PLIST:1.45     Tue Nov 21 21:58:01 2023
+++ pkgsrc/math/py-numpy/PLIST  Fri Jan 19 20:15:33 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2023/11/21 21:58:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.45.2.1 2024/01/19 20:15:33 bsiegert Exp $
 bin/f2py-${PYVERSSUFFIX}
 ${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.txt
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
@@ -666,7 +666,6 @@ ${PLIST.distutils}${PYSITELIB}/numpy/dis
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/build_src.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/build_src.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config_compiler.py
@@ -709,7 +708,6 @@ ${PLIST.distutils}${PYSITELIB}/numpy/dis
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/extension.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/extension.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/absoft.py
@@ -728,11 +726,9 @@ ${PLIST.distutils}${PYSITELIB}/numpy/dis
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/fujitsu.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/fujitsu.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/hpux.py
@@ -787,7 +783,6 @@ ${PLIST.distutils}${PYSITELIB}/numpy/dis
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/line_endings.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/line_endings.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/mingw/gfortran_vs2003_hack.c
@@ -912,6 +907,9 @@ ${PYSITELIB}/numpy/f2py/_backends/meson.
 ${PYSITELIB}/numpy/f2py/_isocbind.py
 ${PYSITELIB}/numpy/f2py/_isocbind.pyc
 ${PYSITELIB}/numpy/f2py/_isocbind.pyo
+${PYSITELIB}/numpy/f2py/_src_pyf.py
+${PYSITELIB}/numpy/f2py/_src_pyf.pyc
+${PYSITELIB}/numpy/f2py/_src_pyf.pyo
 ${PYSITELIB}/numpy/f2py/auxfuncs.py
 ${PYSITELIB}/numpy/f2py/auxfuncs.pyc
 ${PYSITELIB}/numpy/f2py/auxfuncs.pyo
@@ -969,9 +967,13 @@ ${PYSITELIB}/numpy/f2py/tests/src/block_
 ${PYSITELIB}/numpy/f2py/tests/src/callback/foo.f
 ${PYSITELIB}/numpy/f2py/tests/src/callback/gh17797.f90
 ${PYSITELIB}/numpy/f2py/tests/src/callback/gh18335.f90
+${PYSITELIB}/numpy/f2py/tests/src/callback/gh25211.f
+${PYSITELIB}/numpy/f2py/tests/src/callback/gh25211.pyf
+${PYSITELIB}/numpy/f2py/tests/src/cli/gh_22819.pyf
 ${PYSITELIB}/numpy/f2py/tests/src/cli/hi77.f
 ${PYSITELIB}/numpy/f2py/tests/src/cli/hiworld.f90
 ${PYSITELIB}/numpy/f2py/tests/src/common/block.f
+${PYSITELIB}/numpy/f2py/tests/src/common/gh19161.f90
 ${PYSITELIB}/numpy/f2py/tests/src/crackfortran/accesstype.f90
 ${PYSITELIB}/numpy/f2py/tests/src/crackfortran/data_common.f
 ${PYSITELIB}/numpy/f2py/tests/src/crackfortran/data_multiplier.f
@@ -1007,6 +1009,8 @@ ${PYSITELIB}/numpy/f2py/tests/src/parame
 ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_non_compound.f90
 ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_real.f90
 ${PYSITELIB}/numpy/f2py/tests/src/quoted_character/foo.f
+${PYSITELIB}/numpy/f2py/tests/src/regression/gh25337/data.f90
+${PYSITELIB}/numpy/f2py/tests/src/regression/gh25337/use_data.f90
 ${PYSITELIB}/numpy/f2py/tests/src/regression/inout.f90
 ${PYSITELIB}/numpy/f2py/tests/src/return_character/foo77.f
 ${PYSITELIB}/numpy/f2py/tests/src/return_character/foo90.f90
@@ -1022,6 +1026,10 @@ ${PYSITELIB}/numpy/f2py/tests/src/size/f
 ${PYSITELIB}/numpy/f2py/tests/src/string/char.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/fixed_string.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/gh24008.f
+${PYSITELIB}/numpy/f2py/tests/src/string/gh24662.f90
+${PYSITELIB}/numpy/f2py/tests/src/string/gh25286.f90
+${PYSITELIB}/numpy/f2py/tests/src/string/gh25286.pyf
+${PYSITELIB}/numpy/f2py/tests/src/string/gh25286_bc.pyf
 ${PYSITELIB}/numpy/f2py/tests/src/string/scalar_string.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/string.f
 ${PYSITELIB}/numpy/f2py/tests/src/value_attrspec/gh21665.f90
@@ -1079,6 +1087,9 @@ ${PYSITELIB}/numpy/f2py/tests/test_modul
 ${PYSITELIB}/numpy/f2py/tests/test_parameter.py
 ${PYSITELIB}/numpy/f2py/tests/test_parameter.pyc
 ${PYSITELIB}/numpy/f2py/tests/test_parameter.pyo
+${PYSITELIB}/numpy/f2py/tests/test_pyf_src.py
+${PYSITELIB}/numpy/f2py/tests/test_pyf_src.pyc
+${PYSITELIB}/numpy/f2py/tests/test_pyf_src.pyo
 ${PYSITELIB}/numpy/f2py/tests/test_quoted_character.py
 ${PYSITELIB}/numpy/f2py/tests/test_quoted_character.pyc
 ${PYSITELIB}/numpy/f2py/tests/test_quoted_character.pyo

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.86 pkgsrc/math/py-numpy/distinfo:1.86.2.1
--- pkgsrc/math/py-numpy/distinfo:1.86  Fri Nov 17 20:07:47 2023
+++ pkgsrc/math/py-numpy/distinfo       Fri Jan 19 20:15:33 2024
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.86 2023/11/17 20:07:47 wiz Exp $
+$NetBSD: distinfo,v 1.86.2.1 2024/01/19 20:15:33 bsiegert Exp $
 
-BLAKE2s (numpy-1.26.2.tar.gz) = 413814f644d94aa71108fd724d148d0f9ae4f054f119889652c9e771340dfda2
-SHA512 (numpy-1.26.2.tar.gz) = 9986cd34dda921fbc152c3be0e39f003035787ea1e055452b9259d02c423d413080a0c7e4e19fd38d9e28f66d428719d6ebe784c24ae17249ff56494950daf4b
-Size (numpy-1.26.2.tar.gz) = 15664248 bytes
+BLAKE2s (numpy-1.26.3.tar.gz) = 9d0b23c2d8a1866ae82302a00fe0e88078dd221a78379326e49b0042fe745348
+SHA512 (numpy-1.26.3.tar.gz) = 25556b41e2db9cfc52c1dfa61b05e4fc1b7b6df3b169f365375575d1146857fdb5ff91ca1508b968c296b7a06e5c6d95e82c41cdc3561587a46d3aa178f6305d
+Size (numpy-1.26.3.tar.gz) = 15679696 bytes
+SHA1 (patch-numpy_core_code__generators_generate__numpy__api.py) = 6b2ec1ec67408b9d20ec4917356f0b725e9ea266
+SHA1 (patch-numpy_core_code__generators_generate__ufunc__api.py) = 974bb5b9507fe404a3aacda9cf4176993f74e048
 SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 354e336b98f634b6298d0b1d0e85ef1a9d240bff
 SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848
 SHA1 (patch-numpy_core_src_common_mem__overlap.c) = 10d65c7f8ba740ce2bae5ad47ef3162cd2c5a40b

Added files:

Index: pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py
diff -u /dev/null pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py:1.1.2.2
--- /dev/null   Fri Jan 19 20:15:33 2024
+++ pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py      Fri Jan 19 20:15:33 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-numpy_core_code__generators_generate__numpy__api.py,v 1.1.2.2 2024/01/19 20:15:33 bsiegert Exp $
+
+Do not call distutils code, for Python 3.12 compat.
+
+--- numpy/core/code_generators/generate_numpy_api.py.orig      2024-01-15 17:44:12.338306195 +0000
++++ numpy/core/code_generators/generate_numpy_api.py
+@@ -149,10 +149,7 @@ def generate_api(output_dir, force=False
+ 
+     sources = numpy_api.multiarray_api
+ 
+-    if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])):
+-        return targets
+-    else:
+-        do_generate_api(targets, sources)
++    do_generate_api(targets, sources)
+ 
+     return targets
+ 
Index: pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py
diff -u /dev/null pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py:1.1.2.2
--- /dev/null   Fri Jan 19 20:15:33 2024
+++ pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py      Fri Jan 19 20:15:33 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-numpy_core_code__generators_generate__ufunc__api.py,v 1.1.2.2 2024/01/19 20:15:33 bsiegert Exp $
+
+Do not call distutils code, for Python 3.12 compat.
+
+--- numpy/core/code_generators/generate_ufunc_api.py.orig      2024-01-15 17:44:22.009704598 +0000
++++ numpy/core/code_generators/generate_ufunc_api.py
+@@ -126,10 +126,7 @@ def generate_api(output_dir, force=False
+ 
+     sources = ['ufunc_api_order.txt']
+ 
+-    if (not force and not genapi.should_rebuild(targets, sources + [__file__])):
+-        return targets
+-    else:
+-        do_generate_api(targets, sources)
++    do_generate_api(targets, sources)
+ 
+     return targets
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: [pkgsrc-2023Q4] pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: [pkgsrc-2023Q4] pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index