Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MAINT: small simplification of meson.build following best practices #54737

Merged
merged 3 commits into from
Aug 28, 2023
Merged

MAINT: small simplification of meson.build following best practices #54737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10cff09
MAINT: small simplification of meson.build following best practices
dnicolodi Aug 24, 2023
3944d50
MAINT: remove comment about resolved issue
dnicolodi Aug 24, 2023
ac79dc4
BUG: fix build with default Homebrew Python setup
dnicolodi Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions meson.build
View file
Open in desktop
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
View file
Open in desktop
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],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you do the same for pandas/_libs/meson.build and pandas/_libs/tslibs/meson.build?

Copy link
Contributor Author

@dnicolodi dnicolodi Aug 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I'm misunderstanding the request, these other meson.build files do not contain the problematic construct.

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