From c5d228db69cc9bb69812eaeaa88bba650b546724 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 8 Dec 2025 10:56:49 -0800
Subject: [PATCH 1/3] CI: Fix location of cibuildwheel wheels for nightly
 upload

---
 .github/workflows/wheels.yml | 6 +++---
 .gitignore                   | 1 -
 pyproject.toml               | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index fca1a856ba35b..0ae85385c50dc 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -194,18 +194,18 @@ jobs:
 
       - name: Validate wheel RECORD
         shell: bash -el {0}
-        run: for whl in $(ls wheelhouse); do wheel unpack wheelhouse/$whl -d /tmp; done
+        run: for whl in $(ls ./dist/*.whl); do wheel unpack ./dist/$whl -d /tmp; done
 
       - uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
-          path: ./wheelhouse/*.whl
+          path: ./dist/*.whl
 
       - name: Upload wheels & sdist
         if: ${{ success() && env.IS_SCHEDULE_DISPATCH == 'true' }}
         uses: scientific-python/upload-nightly-action@0.6.2
         with:
-          artifacts_path: dist
+          artifacts_path: ./dist
           anaconda_nightly_upload_token: ${{secrets.PANDAS_NIGHTLY_UPLOAD_TOKEN}}
 
   publish:
diff --git a/.gitignore b/.gitignore
index a4a21293ab1ee..5177a195f99f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,7 +67,6 @@ pandas/py.typed
 .ropeproject
 # wheel files
 *.whl
-**/wheelhouse/*
 pip-wheel-metadata
 # coverage
 .coverage
diff --git a/pyproject.toml b/pyproject.toml
index cd151ad7bbe27..f24aefdb11884 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -145,6 +145,7 @@ setup = ['--vsenv'] # For Windows
 
 [tool.cibuildwheel]
 skip = ["*_i686", "*_ppc64le", "*_s390x"]
+output-dir = "dist"
 build-verbosity = 3
 environment = {LDFLAGS="-Wl,--strip-all"}
 test-extras = "test"

From e8753dd29b9730ffdef19edea18bf58af5f8d62a Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:20:52 -0800
Subject: [PATCH 2/3] output-dir is a GHA keyword

---
 .github/workflows/wheels.yml | 1 +
 pyproject.toml               | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 0ae85385c50dc..02744b7761831 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -164,6 +164,7 @@ jobs:
         uses: pypa/cibuildwheel@v3.2.1
         with:
          package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
+         output-dir: ./dist
         env:
           CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
           CIBW_BUILD_FRONTEND: ${{ matrix.cibw_build_frontend || 'pip' }}
diff --git a/pyproject.toml b/pyproject.toml
index f24aefdb11884..cd151ad7bbe27 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -145,7 +145,6 @@ setup = ['--vsenv'] # For Windows
 
 [tool.cibuildwheel]
 skip = ["*_i686", "*_ppc64le", "*_s390x"]
-output-dir = "dist"
 build-verbosity = 3
 environment = {LDFLAGS="-Wl,--strip-all"}
 test-extras = "test"

From fc9b35a4b1366ad81f1b203c425416f966ad61a5 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:37:16 -0800
Subject: [PATCH 3/3] Fix wheel unpack input

---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 02744b7761831..48884db917322 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -195,7 +195,7 @@ jobs:
 
       - name: Validate wheel RECORD
         shell: bash -el {0}
-        run: for whl in $(ls ./dist/*.whl); do wheel unpack ./dist/$whl -d /tmp; done
+        run: for whl in $(ls ./dist/*.whl); do wheel unpack $whl -d /tmp; done
 
       - uses: actions/upload-artifact@v5
         with: