From 10cff0976adf2a0eebb79f52f3569f7751a30317 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Thu, 24 Aug 2023 22:02:00 +0200 Subject: [PATCH 1/3] MAINT: small simplification of meson.build following best practices --- meson.build | 4 +--- pandas/_libs/window/meson.build | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meson.build b/meson.build index a927b59abeaf9..70bc7ad575581 100644 --- a/meson.build +++ b/meson.build @@ -16,10 +16,8 @@ project( ] ) -py_mod = import('python') fs = import('fs') -py = py_mod.find_installation('python') -py_dep = py.dependency() +py = import('python').find_installation() tempita = files('generate_pxi.py') versioneer = files('generate_version.py') diff --git a/pandas/_libs/window/meson.build b/pandas/_libs/window/meson.build index b83d8730f9447..85aa060a26406 100644 --- a/pandas/_libs/window/meson.build +++ b/pandas/_libs/window/meson.build @@ -3,7 +3,6 @@ py.extension_module( ['aggregations.pyx'], cython_args: ['-X always_allow_keywords=true'], include_directories: [inc_np, inc_pd], - dependencies: [py_dep], subdir: 'pandas/_libs/window', override_options : ['cython_language=cpp'], install: true @@ -14,7 +13,6 @@ py.extension_module( ['indexers.pyx'], cython_args: ['-X always_allow_keywords=true'], include_directories: [inc_np, inc_pd], - dependencies: [py_dep], subdir: 'pandas/_libs/window', install: true ) From 3944d501a8f4dc3c053102e8039e0abe6f9d0567 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Thu, 24 Aug 2023 22:04:09 +0200 Subject: [PATCH 2/3] MAINT: remove comment about resolved issue --- meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build index 70bc7ad575581..09a1494135af4 100644 --- a/meson.build +++ b/meson.build @@ -6,9 +6,6 @@ project( license: 'BSD-3', meson_version: '>=1.0.1', default_options: [ - # TODO: investigate, does meson try to compile against debug Python - # when buildtype = debug, this seems to be causing problems on CI - # where provided Python is not compiled in debug mode 'buildtype=release', # TODO: Reactivate werror, some warnings on Windows #'werror=true', From ac79dc4d7a3feac58e50f8325d52b396a1f3d07f Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Thu, 24 Aug 2023 22:07:52 +0200 Subject: [PATCH 3/3] BUG: fix build with default Homebrew Python setup Homebrew does not install a python link, just python3. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 09a1494135af4..e16f565d491fe 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project( 'pandas', 'c', 'cpp', 'cython', - version: run_command(['python', 'generate_version.py', '--print'], check: true).stdout().strip(), + version: run_command(['python3', 'generate_version.py', '--print'], check: true).stdout().strip(), license: 'BSD-3', meson_version: '>=1.0.1', default_options: [