Skip to content

Commit 4768051

Browse files
dnicolodimroeschke
authored andcommitted
MAINT: small simplification of meson.build following best practices (pandas-dev#54737)
* MAINT: small simplification of meson.build following best practices * MAINT: remove comment about resolved issue * BUG: fix build with default Homebrew Python setup Homebrew does not install a python link, just python3.
1 parent 5536671 commit 4768051

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

meson.build

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
project(
33
'pandas',
44
'c', 'cpp', 'cython',
5-
version: run_command(['python', 'generate_version.py', '--print'], check: true).stdout().strip(),
5+
version: run_command(['python3', '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
129
'buildtype=release',
1310
# TODO: Reactivate werror, some warnings on Windows
1411
#'werror=true',
1512
'c_std=c99'
1613
]
1714
)
1815

19-
py_mod = import('python')
2016
fs = import('fs')
21-
py = py_mod.find_installation('python')
22-
py_dep = py.dependency()
17+
py = import('python').find_installation()
2318
tempita = files('generate_pxi.py')
2419
versioneer = files('generate_version.py')
2520

pandas/_libs/window/meson.build

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ 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],
76
subdir: 'pandas/_libs/window',
87
override_options : ['cython_language=cpp'],
98
install: true
@@ -14,7 +13,6 @@ py.extension_module(
1413
['indexers.pyx'],
1514
cython_args: ['-X always_allow_keywords=true'],
1615
include_directories: [inc_np, inc_pd],
17-
dependencies: [py_dep],
1816
subdir: 'pandas/_libs/window',
1917
install: true
2018
)

0 commit comments

Comments
 (0)