Skip to content

Commit

Permalink
MAINT: small simplification of meson.build following best practices (p…
Browse files Browse the repository at this point in the history
…andas-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.
  • Loading branch information
dnicolodi authored Aug 28, 2023
1 parent 23b546f commit ca42994
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 2 additions & 7 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,19 @@
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: [
# 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',
'c_std=c99'
]
)

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')

Expand Down
2 changes: 0 additions & 2 deletions pandas/_libs/window/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)

0 comments on commit ca42994

Please sign in to comment.