Skip to content

Commit 93a5b8f

Browse files
authored
Revert "MAINT: small simplification of meson.build following best practices (#54737)"
This reverts commit ca42994.
1 parent ca42994 commit 93a5b8f

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

meson.build

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22
project(
33
'pandas',
44
'c', 'cpp', 'cython',
5-
version: run_command(['python3', 'generate_version.py', '--print'], check: true).stdout().strip(),
5+
version: run_command(['python', 'generate_version.py', '--print'], check: true).stdout().strip(),
66
license: 'BSD-3',
77
meson_version: '>=1.0.1',
88
default_options: [
9+
# TODO: investigate, does meson try to compile against debug Python
10+
# when buildtype = debug, this seems to be causing problems on CI
11+
# where provided Python is not compiled in debug mode
912
'buildtype=release',
1013
# TODO: Reactivate werror, some warnings on Windows
1114
#'werror=true',
1215
'c_std=c99'
1316
]
1417
)
1518

19+
py_mod = import('python')
1620
fs = import('fs')
17-
py = import('python').find_installation()
21+
py = py_mod.find_installation('python')
22+
py_dep = py.dependency()
1823
tempita = files('generate_pxi.py')
1924
versioneer = files('generate_version.py')
2025

pandas/_libs/window/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ py.extension_module(
33
['aggregations.pyx'],
44
cython_args: ['-X always_allow_keywords=true'],
55
include_directories: [inc_np, inc_pd],
6+
dependencies: [py_dep],
67
subdir: 'pandas/_libs/window',
78
override_options : ['cython_language=cpp'],
89
install: true
@@ -13,6 +14,7 @@ py.extension_module(
1314
['indexers.pyx'],
1415
cython_args: ['-X always_allow_keywords=true'],
1516
include_directories: [inc_np, inc_pd],
17+
dependencies: [py_dep],
1618
subdir: 'pandas/_libs/window',
1719
install: true
1820
)

0 commit comments

Comments
 (0)