CVS commit: pkgsrc/math/py-pandas

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Oct  5 04:46:05 UTC 2023

Modified Files:
        pkgsrc/math/py-pandas: Makefile distinfo
Added Files:
        pkgsrc/math/py-pandas/patches: patch-meson.build

Log Message:
py-pandas: fix (sandboxed) non-default Python builds

Another issue where Meson isn't versioned in pkgsrc, so we end up with
it "helpfully" supplying the path to Python it believes is correct,
which is wrong for any non-default Python version. (The 2.1.0 version
of this package carried a similar fix, which was removed in the update
to 2.1.1; a variation of it is restored here.)

Separately, this package directly expresses a minimum Meson version, so
reflect that as well.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/math/py-pandas/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/math/py-pandas/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/py-pandas/patches/patch-meson.build

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-pandas/Makefile
diff -u pkgsrc/math/py-pandas/Makefile:1.49 pkgsrc/math/py-pandas/Makefile:1.50
--- pkgsrc/math/py-pandas/Makefile:1.49 Thu Sep 28 16:01:24 2023
+++ pkgsrc/math/py-pandas/Makefile      Thu Oct  5 04:46:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2023/09/28 16:01:24 adam Exp $
+# $NetBSD: Makefile,v 1.50 2023/10/05 04:46:05 gutteridge Exp $
 
 DISTNAME=      pandas-2.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +11,7 @@ COMMENT=      Python Data Analysis Library
 LICENSE=       modified-bsd
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-cython>=0.29.33:../../devel/py-cython
+TOOL_DEPENDS+= meson>=1.2.1:../../devel/meson  # Directly expresses meson minimum
 TOOL_DEPENDS+= ${PYPKGPREFIX}-meson_python>=0.13.1:../../devel/py-meson_python
 TOOL_DEPENDS+= ${PYPKGPREFIX}-versioneer-[0-9]*:../../devel/py-versioneer
 DEPENDS+=      ${PYPKGPREFIX}-dateutil>=2.8.2:../../time/py-dateutil
@@ -27,6 +28,12 @@ USE_TOOLS+=  pkg-config
 
 USE_CXX_FEATURES=      c++11
 
+SUBST_CLASSES+=                python
+SUBST_STAGE.python=    pre-configure
+SUBST_MESSAGE.python=  Fixing python binary name.
+SUBST_FILES.python=    meson.build
+SUBST_VARS.python=     TOOL_PYTHONBIN
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
 # This would otherwise be installed, causing PLIST mismatch

Index: pkgsrc/math/py-pandas/distinfo
diff -u pkgsrc/math/py-pandas/distinfo:1.35 pkgsrc/math/py-pandas/distinfo:1.36
--- pkgsrc/math/py-pandas/distinfo:1.35 Thu Sep 28 16:01:24 2023
+++ pkgsrc/math/py-pandas/distinfo      Thu Oct  5 04:46:05 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.35 2023/09/28 16:01:24 adam Exp $
+$NetBSD: distinfo,v 1.36 2023/10/05 04:46:05 gutteridge Exp $
 
 BLAKE2s (pandas-2.1.1.tar.gz) = 63d634ada35028456eccece8396c951ca1a631a3f64e717c055a7822995137eb
 SHA512 (pandas-2.1.1.tar.gz) = 346e13e06805948c569712028c9b8d756c67ca2fab040999a51a4e759206d50d8ee25be38ac3c7cb3d2e692a02d85c1ec198841311fe43cb04b64f2741627a4e
 Size (pandas-2.1.1.tar.gz) = 4266250 bytes
+SHA1 (patch-meson.build) = f802806a1ec2de5f466eb29c3037c54cbf9971b1
 SHA1 (patch-pandas___libs_window_aggregations.pyx) = 65e3ec2b165de00b23550a989c5eb77c81c759f3

Added files:

Index: pkgsrc/math/py-pandas/patches/patch-meson.build
diff -u /dev/null pkgsrc/math/py-pandas/patches/patch-meson.build:1.1
--- /dev/null   Thu Oct  5 04:46:05 2023
+++ pkgsrc/math/py-pandas/patches/patch-meson.build     Thu Oct  5 04:46:05 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson.build,v 1.1 2023/10/05 04:46:05 gutteridge Exp $
+
+Allow for differences between meson's idea of the path to Python and the
+version that's actually the target. (meson is not py-versioned.)
+
+--- meson.build.orig   1970-01-01 00:00:00.000000000 +0000
++++ meson.build
+@@ -2,7 +2,7 @@
+ project(
+     'pandas',
+     'c', 'cpp', 'cython',
+-    version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(),
++    version: run_command(['@TOOL_PYTHONBIN@', 'generate_version.py', '--print'], check: true).stdout().strip(),
+     license: 'BSD-3',
+     meson_version: '>=1.2.1',
+     default_options: [