From 8ede185c48e0467e0b0427e3e6bffba63ab6c784 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Aug 2025 15:04:54 -0700 Subject: [PATCH 01/15] DEPS: Bump Meson, lower pin Cython --- ci/deps/actions-311-minimum_versions.yaml | 6 +++--- ci/deps/actions-311.yaml | 6 +++--- ci/deps/actions-312.yaml | 6 +++--- ci/deps/actions-313-downstream_compat.yaml | 6 +++--- ci/deps/actions-313-freethreading.yaml | 2 +- ci/deps/actions-313-numpydev.yaml | 6 +++--- ci/deps/actions-313-pyarrownightly.yaml | 6 +++--- ci/deps/actions-313.yaml | 6 +++--- environment.yml | 6 +++--- pyproject.toml | 6 +++--- requirements-dev.txt | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ci/deps/actions-311-minimum_versions.yaml b/ci/deps/actions-311-minimum_versions.yaml index f9dc5d2367344..a101498415ef8 100644 --- a/ci/deps/actions-311-minimum_versions.yaml +++ b/ci/deps/actions-311-minimum_versions.yaml @@ -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.6,<2 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index deb646a7ba86a..51ac47a5e3bfe 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -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.6,<2 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 5a24b0c1077d0..3a79c37e880ba 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -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.6,<2 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-313-downstream_compat.yaml b/ci/deps/actions-313-downstream_compat.yaml index c118bbcdf1697..13f46b9461983 100644 --- a/ci/deps/actions-313-downstream_compat.yaml +++ b/ci/deps/actions-313-downstream_compat.yaml @@ -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.6,<2 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-313-freethreading.yaml b/ci/deps/actions-313-freethreading.yaml index e118080bc4c40..4639135ef284e 100644 --- a/ci/deps/actions-313-freethreading.yaml +++ b/ci/deps/actions-313-freethreading.yaml @@ -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 diff --git a/ci/deps/actions-313-numpydev.yaml b/ci/deps/actions-313-numpydev.yaml index a1474d70c9487..b5b100737aca7 100644 --- a/ci/deps/actions-313-numpydev.yaml +++ b/ci/deps/actions-313-numpydev.yaml @@ -6,9 +6,9 @@ dependencies: # build dependencies - versioneer - - meson=1.2.1 - - meson-python=0.13.1 - - cython<4.0.0a0 + - meson>=1.6,<2 + - meson-python>=0.17.1,<1 + - cython>=3.1,<4.0.0a0 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-313-pyarrownightly.yaml b/ci/deps/actions-313-pyarrownightly.yaml index e56813cffb901..22310ac9a67d8 100644 --- a/ci/deps/actions-313-pyarrownightly.yaml +++ b/ci/deps/actions-313-pyarrownightly.yaml @@ -6,9 +6,9 @@ dependencies: # build dependencies - versioneer - - meson=1.2.1 - - cython<4.0.0a0 - - meson-python=0.13.1 + - meson>=1.6,<2 + - cython>=3.1,<4.0.0a0 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml index ffca09b901852..ed043ca08ec94 100644 --- a/ci/deps/actions-313.yaml +++ b/ci/deps/actions-313.yaml @@ -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.6,<2 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/environment.yml b/environment.yml index 1c7ebd0cea1ff..c2d9219c64189 100644 --- a/environment.yml +++ b/environment.yml @@ -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.6,<2 + - meson-python>=0.17.1,<1 # test dependencies - pytest>=7.3.2 diff --git a/pyproject.toml b/pyproject.toml index 0ea46b92e9e01..73390924468ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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>=1.2.1,<2", + "meson-python>=0.17.1,<1", + "meson>=1.6,<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", diff --git a/requirements-dev.txt b/requirements-dev.txt index 708aa7567a009..dc36c178368d4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ pip versioneer[toml] -cython<4.0.0a0 +cython>=3.1,<4.0.0a0 meson[ninja]==1.2.1 meson-python==0.13.1 pytest>=7.3.2 From d5b978b0dd1f96677fd91c1dd84d18d092115e8c Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Aug 2025 15:11:06 -0700 Subject: [PATCH 02/15] Update meson in requirements-dev.txt --- requirements-dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dc36c178368d4..106d395e3d065 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,8 +4,8 @@ pip versioneer[toml] cython>=3.1,<4.0.0a0 -meson[ninja]==1.2.1 -meson-python==0.13.1 +meson[ninja]>=1.6,<2 +meson-python>=0.17.1,<1 pytest>=7.3.2 pytest-cov pytest-xdist>=3.4.0 From 29dda9f68fa30d20a27c84963f498ec976498071 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:42:31 -0700 Subject: [PATCH 03/15] ingore unused-parameter --- .github/actions/build_pandas/action.yml | 11 ++++------- .github/workflows/unit-tests.yml | 3 --- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index 2d208cb38725a..4bb54efd7371c 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -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: @@ -26,12 +23,12 @@ runs: shell: bash -el {0} - name: Build Pandas + # wno-error reason: https://github.com/cython/cython/issues/6870 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" -Csetup-args="-Wno-error=unused-parameter" shell: bash -el {0} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 46490fa324009..16cf06a98c9ae 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -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 From 4d57c82f8c69e7d8ffcd838f1d30aad32f457ff5 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:01:54 -0700 Subject: [PATCH 04/15] use wheel command? --- .github/actions/build_pandas/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index 4bb54efd7371c..08c4da292ca2d 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -30,5 +30,6 @@ runs: else EDITABLE="" fi - pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="-Werror" -Csetup-args="-Wno-error=unused-parameter" + pip wheel $EDITABLE --no-build-isolation -v --no-deps --config-settings=setup-args="-Werror" --config-settings=setup-args="-Wno-error=unused-parameter" --wheel-dir=/tmp/wheelhouse . + pip install --no-index --find-links=/tmp/wheelhouse pandas shell: bash -el {0} From c3cc3df02ec01caf810646ec220f4bbce929a746 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:05:19 -0700 Subject: [PATCH 05/15] got back to pip install version --- .github/actions/build_pandas/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index 08c4da292ca2d..4bb54efd7371c 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -30,6 +30,5 @@ runs: else EDITABLE="" fi - pip wheel $EDITABLE --no-build-isolation -v --no-deps --config-settings=setup-args="-Werror" --config-settings=setup-args="-Wno-error=unused-parameter" --wheel-dir=/tmp/wheelhouse . - pip install --no-index --find-links=/tmp/wheelhouse pandas + pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="-Werror" -Csetup-args="-Wno-error=unused-parameter" shell: bash -el {0} From 02c7a1a8cccbcaa626f0c810c08401fe180e7bf7 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:09:12 -0700 Subject: [PATCH 06/15] Try this? --- .github/actions/build_pandas/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index 4bb54efd7371c..47bdc5973c20e 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -30,5 +30,5 @@ runs: else EDITABLE="" fi - pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="-Werror" -Csetup-args="-Wno-error=unused-parameter" + pip install $EDITABLE . --no-build-isolation -v --no-deps --config-settings=setup-args="-Werror" --config-settings=setup-args="-Wno-error=unused-parameter" shell: bash -el {0} From b2d36a06c1c0c9be6dc0cf92c5a303b4d1a1df69 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 09:12:51 -0700 Subject: [PATCH 07/15] unbump meson --- ci/deps/actions-311-minimum_versions.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-312.yaml | 2 +- ci/deps/actions-313-downstream_compat.yaml | 2 +- ci/deps/actions-313-numpydev.yaml | 2 +- ci/deps/actions-313-pyarrownightly.yaml | 2 +- ci/deps/actions-313.yaml | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- requirements-dev.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/deps/actions-311-minimum_versions.yaml b/ci/deps/actions-311-minimum_versions.yaml index a804afb335741..f6a58e9e82fd6 100644 --- a/ci/deps/actions-311-minimum_versions.yaml +++ b/ci/deps/actions-311-minimum_versions.yaml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1,<4.0.0a0 - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 # test dependencies diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 0b9911a2e9f20..82d2911f52bd5 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1,<4.0.0a0 - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 # test dependencies diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 48c7a1433dddd..adf93733906bc 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1,<4.0.0a0 - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 # test dependencies diff --git a/ci/deps/actions-313-downstream_compat.yaml b/ci/deps/actions-313-downstream_compat.yaml index 3145675977133..8fa5b03b65c95 100644 --- a/ci/deps/actions-313-downstream_compat.yaml +++ b/ci/deps/actions-313-downstream_compat.yaml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1,<4.0.0a0 - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 # test dependencies diff --git a/ci/deps/actions-313-numpydev.yaml b/ci/deps/actions-313-numpydev.yaml index b5b100737aca7..99034c827beee 100644 --- a/ci/deps/actions-313-numpydev.yaml +++ b/ci/deps/actions-313-numpydev.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 - cython>=3.1,<4.0.0a0 diff --git a/ci/deps/actions-313-pyarrownightly.yaml b/ci/deps/actions-313-pyarrownightly.yaml index 22310ac9a67d8..b8728c13626f5 100644 --- a/ci/deps/actions-313-pyarrownightly.yaml +++ b/ci/deps/actions-313-pyarrownightly.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - meson>=1.6,<2 + - meson>=1.2.1,<2 - cython>=3.1,<4.0.0a0 - meson-python>=0.17.1,<1 diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml index 9a3c8d26d06d7..fe9a573741b70 100644 --- a/ci/deps/actions-313.yaml +++ b/ci/deps/actions-313.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1,<4.0.0a0 - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 # test dependencies diff --git a/environment.yml b/environment.yml index ba56711702abe..9a4e662a51851 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1,<4.0.0a0 - - meson>=1.6,<2 + - meson>=1.2.1,<2 - meson-python>=0.17.1,<1 # test dependencies diff --git a/pyproject.toml b/pyproject.toml index 32f4872d0a142..16462daf84c13 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # See https://github.com/scipy/scipy/pull/12940 for the AIX issue. requires = [ "meson-python>=0.17.1,<1", - "meson>=1.6,<2", + "meson>=1.2.1,<2", "wheel", "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 diff --git a/requirements-dev.txt b/requirements-dev.txt index c99c4f28678fb..e6802353ed291 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ pip versioneer[toml] cython>=3.1,<4.0.0a0 -meson[ninja]>=1.6,<2 +meson[ninja]>=1.2.1,<2 meson-python>=0.17.1,<1 pytest>=7.3.2 pytest-cov From e71250bfcf05ff314d4c55c0ad0d0110a74428ab Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 09:16:02 -0700 Subject: [PATCH 08/15] Add unused-parameter to meson build instead --- .github/actions/build_pandas/action.yml | 3 +-- meson.build | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index 47bdc5973c20e..a84eedbe7203f 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -23,12 +23,11 @@ runs: shell: bash -el {0} - name: Build Pandas - # wno-error reason: https://github.com/cython/cython/issues/6870 run: | if [[ ${{ inputs.editable }} == "true" ]]; then EDITABLE="-e" else EDITABLE="" fi - pip install $EDITABLE . --no-build-isolation -v --no-deps --config-settings=setup-args="-Werror" --config-settings=setup-args="-Wno-error=unused-parameter" + pip install $EDITABLE . --no-build-isolation -v --no-deps -Ccompile-args="-Werror" shell: bash -el {0} diff --git a/meson.build b/meson.build index 6a00e52481108..3cb6bcecfbab2 100644 --- a/meson.build +++ b/meson.build @@ -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') From 5deb5d9939caeae751a1a6775ac6e5f2a1f00f1b Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 09:38:40 -0700 Subject: [PATCH 09/15] Use csetup-args --- .github/actions/build_pandas/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index a84eedbe7203f..ed8dd989316a7 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -29,5 +29,5 @@ runs: else EDITABLE="" fi - pip install $EDITABLE . --no-build-isolation -v --no-deps -Ccompile-args="-Werror" + pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="-Werror" shell: bash -el {0} From 4f6f5f9face5673e599e618b91b81f9d9f7fbee9 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 10:02:05 -0700 Subject: [PATCH 10/15] Update .github/actions/build_pandas/action.yml Co-authored-by: William Ayd --- .github/actions/build_pandas/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build_pandas/action.yml b/.github/actions/build_pandas/action.yml index ed8dd989316a7..786ad5895ac5a 100644 --- a/.github/actions/build_pandas/action.yml +++ b/.github/actions/build_pandas/action.yml @@ -29,5 +29,5 @@ runs: else EDITABLE="" fi - pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="-Werror" + pip install $EDITABLE . --no-build-isolation -v --no-deps -Csetup-args="--werror" shell: bash -el {0} From 20b55a678a51c0413ba6d28e495525031453d9f4 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 10:45:53 -0700 Subject: [PATCH 11/15] Update meson.build Co-authored-by: William Ayd --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3cb6bcecfbab2..bb7d0d3c84ea0 100644 --- a/meson.build +++ b/meson.build @@ -47,7 +47,7 @@ endif cc = meson.get_compiler('c') add_project_arguments( # https://github.com/cython/cython/issues/6870 - cc.get_supported_arguments(['-Wno-error=unused-parameter']), + cc.get_supported_arguments(['-Wno-error=unused-parameter', '-Wno-error=unused-function']), language: 'c', ) cy = meson.get_compiler('cython') From 930715b253c3af843944f6e490bf17106809e793 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 14:20:21 -0700 Subject: [PATCH 12/15] Add another unused-function? --- pandas/_libs/meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build index 33fc65e5034d0..4230ae7afbcce 100644 --- a/pandas/_libs/meson.build +++ b/pandas/_libs/meson.build @@ -50,6 +50,15 @@ _khash_primitive_helper_dep = declare_dependency( sources: _khash_primitive_helper, ) +cc = meson.get_compiler('c') +add_project_arguments( +# https://github.com/cython/cython/issues/6870 + cc.get_supported_arguments( + ['-Wno-error=unused-parameter', '-Wno-error=unused-function'], + ), + language: 'c', +) + cdata = configuration_data() if cy.version().version_compare('>=3.1.0') cdata.set('freethreading_compatible', '1') From 42fd72c0d4df9a413ce0e2bd3d9029fd94e2c49b Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 13 Aug 2025 14:28:08 -0700 Subject: [PATCH 13/15] Revert "Add another unused-function?" This reverts commit 930715b253c3af843944f6e490bf17106809e793. --- pandas/_libs/meson.build | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build index 4230ae7afbcce..33fc65e5034d0 100644 --- a/pandas/_libs/meson.build +++ b/pandas/_libs/meson.build @@ -50,15 +50,6 @@ _khash_primitive_helper_dep = declare_dependency( sources: _khash_primitive_helper, ) -cc = meson.get_compiler('c') -add_project_arguments( -# https://github.com/cython/cython/issues/6870 - cc.get_supported_arguments( - ['-Wno-error=unused-parameter', '-Wno-error=unused-function'], - ), - language: 'c', -) - cdata = configuration_data() if cy.version().version_compare('>=3.1.0') cdata.set('freethreading_compatible', '1') From 20efb844a796ba1c4fd6992db77bffd9e1bcf663 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 14 Aug 2025 08:50:28 -0700 Subject: [PATCH 14/15] format meson.build --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index bb7d0d3c84ea0..d607d9dcf7041 100644 --- a/meson.build +++ b/meson.build @@ -47,7 +47,9 @@ endif cc = meson.get_compiler('c') add_project_arguments( # https://github.com/cython/cython/issues/6870 - cc.get_supported_arguments(['-Wno-error=unused-parameter', '-Wno-error=unused-function']), + cc.get_supported_arguments( + ['-Wno-error=unused-parameter', '-Wno-error=unused-function'], + ), language: 'c', ) cy = meson.get_compiler('cython') From b7a9f9877725b25507c01b1a342d4fd36619c4f0 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 14 Aug 2025 08:56:02 -0700 Subject: [PATCH 15/15] Add __init__.py in templates directory --- pandas/io/formats/templates/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pandas/io/formats/templates/__init__.py diff --git a/pandas/io/formats/templates/__init__.py b/pandas/io/formats/templates/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d