Skip to content

DEPS: Bump meson-python, lower pin Cython #62086

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

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
+41 −40
Open

DEPS: Bump meson-python, lower pin Cython #62086

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8ede185
DEPS: Bump Meson, lower pin Cython
mroeschke Aug 10, 2025
d5b978b
Update meson in requirements-dev.txt
mroeschke Aug 10, 2025
29dda9f
ingore unused-parameter
mroeschke Aug 11, 2025
4d57c82
use wheel command?
mroeschke Aug 11, 2025
c3cc3df
got back to pip install version
mroeschke Aug 11, 2025
02c7a1a
Try this?
mroeschke Aug 11, 2025
273aea7
Merge remote-tracking branch 'upstream/main' into bump/build-deps
mroeschke Aug 13, 2025
b2d36a0
unbump meson
mroeschke Aug 13, 2025
e71250b
Add unused-parameter to meson build instead
mroeschke Aug 13, 2025
5deb5d9
Use csetup-args
mroeschke Aug 13, 2025
4f6f5f9
Update .github/actions/build_pandas/action.yml
mroeschke Aug 13, 2025
20b55a6
Update meson.build
mroeschke Aug 13, 2025
930715b
Add another unused-function?
mroeschke Aug 13, 2025
42fd72c
Revert "Add another unused-function?"
mroeschke Aug 13, 2025
2fd6981
Merge remote-tracking branch 'upstream/main' into bump/build-deps
mroeschke Aug 14, 2025
20efb84
format meson.build
mroeschke Aug 14, 2025
b7a9f98
Add __init__.py in templates directory
mroeschke Aug 14, 2025
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
10 changes: 3 additions & 7 deletions .github/actions/build_pandas/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ inputs:
editable:
description: Whether to build pandas in editable mode (default true)
default: true
werror:
description: Enable werror flag for build
default: true
runs:
using: composite
steps:
Expand All @@ -28,10 +25,9 @@ runs:
- name: Build Pandas
run: |
if [[ ${{ inputs.editable }} == "true" ]]; then
pip install -e . --no-build-isolation -v --no-deps \
${{ inputs.werror == 'true' && '-Csetup-args="--werror"' || '' }}
EDITABLE="-e"
else
pip install . --no-build-isolation -v --no-deps \
${{ inputs.werror == 'true' && '-Csetup-args="--werror"' || '' }}
EDITABLE=""
fi
pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="--werror"
shell: bash -el {0}
3 changes: 0 additions & 3 deletions .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ jobs:
- name: Build Pandas
id: build
uses: ./.github/actions/build_pandas
with:
# xref https://github.com/cython/cython/issues/6870
werror: ${{ matrix.name != 'Freethreading' }}

- name: Test (not single_cpu)
uses: ./.github/actions/run-tests
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-311-minimum_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dependencies:

# build dependencies
- versioneer
- cython<4.0.0a0
- meson=1.2.1
- meson-python=0.13.1
- cython>=3.1,<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1
Comment on lines +12 to +13
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to keep the pin here since this is the build with minimum versions?


# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-311.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:

# build dependencies
- versioneer
- cython<4.0.0a0
- meson=1.2.1
- meson-python=0.13.1
- cython>=3.1,<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1

# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-312.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:

# build dependencies
- versioneer
- cython<4.0.0a0
- meson=1.2.1
- meson-python=0.13.1
- cython>=3.1,<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1

# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-313-downstream_compat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies:

# build dependencies
- versioneer
- cython<4.0.0a0
- meson=1.2.1
- meson-python=0.13.1
- cython>=3.1,<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1

# test dependencies
- pytest>=7.3.2
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/actions-313-freethreading.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
# build dependencies
- setuptools
- versioneer
- cython<4.0.0a0
- cython>=3.1,<4.0.0a0
- meson=1.8.0
- meson-python=0.18.0

Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-313-numpydev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:

# build dependencies
- versioneer
- meson=1.2.1
- meson-python=0.13.1
- cython<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1
- cython>=3.1,<4.0.0a0

# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-313-pyarrownightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:

# build dependencies
- versioneer
- meson=1.2.1
- cython<4.0.0a0
- meson-python=0.13.1
- meson>=1.2.1,<2
- cython>=3.1,<4.0.0a0
- meson-python>=0.17.1,<1

# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/actions-313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:

# build dependencies
- versioneer
- cython<4.0.0a0
- meson=1.2.1
- meson-python=0.13.1
- cython>=3.1,<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1

# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 3 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dependencies:

# build dependencies
- versioneer
- cython<4.0.0a0
- meson=1.2.1
- meson-python=0.13.1
- cython>=3.1,<4.0.0a0
- meson>=1.2.1,<2
- meson-python>=0.17.1,<1

# test dependencies
- pytest>=7.3.2
Expand Down
6 changes: 6 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ else
meson.add_dist_script(py, versioneer, '-o', '_version_meson.py')
endif

cc = meson.get_compiler('c')
add_project_arguments(
# https://github.com/cython/cython/issues/6870
cc.get_supported_arguments(['-Wno-error=unused-parameter']),
language: 'c',
)
cy = meson.get_compiler('cython')
if cy.version().version_compare('>=3.1.0')
add_project_arguments('-Xfreethreading_compatible=true', language: 'cython')
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Minimum requirements for the build system to execute.
# See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
requires = [
"meson-python>=0.13.1",
"meson-python>=0.17.1,<1",
"meson>=1.2.1,<2",
"wheel",
"Cython<4.0.0a0", # Note: sync with setup.py, environment.yml and asv.conf.json
"Cython>=3.1,<4.0.0a0", # Note: sync with setup.py, environment.yml and asv.conf.json
# Force numpy higher than 2.0rc1, so that built wheels are compatible
# with both numpy 1 and 2
"numpy>=2.0.0rc1",
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

pip
versioneer[toml]
cython<4.0.0a0
meson[ninja]==1.2.1
meson-python==0.13.1
cython>=3.1,<4.0.0a0
meson[ninja]>=1.2.1,<2
meson-python>=0.17.1,<1
pytest>=7.3.2
pytest-cov
pytest-xdist>=3.4.0
Expand Down
Loading