From bb27294014ffabf925e7d6f666139697bfdf1899 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:22:24 -0500
Subject: [PATCH 01/11] CI: Start testing on M1

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

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index a3cffb4b03b93..1b4aa3fe0b1bc 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -214,7 +214,8 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        # Note: Don't use macOS latest since macos 14 appears to be arm64 only
+        os: [macos-13, macos-14, windows-latest]
         env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
       fail-fast: false
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 841559c8e9799..a703367f3c7e0 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -94,7 +94,9 @@ jobs:
         buildplat:
         - [ubuntu-22.04, manylinux_x86_64]
         - [ubuntu-22.04, musllinux_x86_64]
-        - [macos-12, macosx_*]
+        - [macos-12, macosx_x86_64]
+        # Note: M1 images on Github Actions start from macOS 14
+        - [macos-14, macosx_arm64]
         - [windows-2022, win_amd64]
         # TODO: support PyPy?
         python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"]]
diff --git a/pyproject.toml b/pyproject.toml
index ffd3a7e1f1f33..c64071dbcb082 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -161,10 +161,6 @@ test-command = """
   pd.test(extra_args=["-m not clipboard and single_cpu and not slow and not network and not db", "--no-strict-data-files"]);' \
   """
 
-[tool.cibuildwheel.macos]
-archs = "x86_64 arm64"
-test-skip = "*_arm64"
-
 [tool.cibuildwheel.windows]
 before-build = "pip install delvewheel"
 repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}"

From 1890c74a0e565edefb9b6ea8cacb989268ce8937 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:31:08 -0500
Subject: [PATCH 02/11] install pytest-localserver from pip

---
 ci/deps/actions-310.yaml | 2 +-
 ci/deps/actions-311.yaml | 2 +-
 ci/deps/actions-312.yaml | 1 +
 ci/deps/actions-39.yaml  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml
index 45f114322015b..a3e44e6373145 100644
--- a/ci/deps/actions-310.yaml
+++ b/ci/deps/actions-310.yaml
@@ -14,7 +14,6 @@ dependencies:
   - pytest>=7.3.2
   - pytest-cov
   - pytest-xdist>=2.2.0
-  - pytest-localserver>=0.7.1
   - pytest-qt>=4.2.0
   - boto3
 
@@ -61,3 +60,4 @@ dependencies:
     - adbc-driver-postgresql>=0.8.0
     - adbc-driver-sqlite>=0.8.0
     - tzdata>=2022.7
+    - pytest-localserver>=0.7.1
diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
index d14686696e669..33751c8262063 100644
--- a/ci/deps/actions-311.yaml
+++ b/ci/deps/actions-311.yaml
@@ -60,4 +60,4 @@ dependencies:
   - pip:
     - adbc-driver-postgresql>=0.8.0
     - adbc-driver-sqlite>=0.8.0
-    - tzdata>=2022.7
+    - pytest-localserver>=0.7.1
diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml
index 86aaf24b4e15c..96422c752ddcf 100644
--- a/ci/deps/actions-312.yaml
+++ b/ci/deps/actions-312.yaml
@@ -61,3 +61,4 @@ dependencies:
     - adbc-driver-postgresql>=0.8.0
     - adbc-driver-sqlite>=0.8.0
     - tzdata>=2022.7
+    - pytest-localserver>=0.7.1
diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml
index 31ee74174cd46..b162a78e7f115 100644
--- a/ci/deps/actions-39.yaml
+++ b/ci/deps/actions-39.yaml
@@ -14,7 +14,6 @@ dependencies:
   - pytest>=7.3.2
   - pytest-cov
   - pytest-xdist>=2.2.0
-  - pytest-localserver>=0.7.1
   - pytest-qt>=4.2.0
   - boto3
 
@@ -61,3 +60,4 @@ dependencies:
     - adbc-driver-postgresql>=0.8.0
     - adbc-driver-sqlite>=0.8.0
     - tzdata>=2022.7
+    - pytest-localserver>=0.7.1

From efefbe6039b81bc3bde95f52e358c986571f1516 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:33:56 -0500
Subject: [PATCH 03/11] typo

---
 ci/deps/actions-311.yaml | 1 -
 ci/deps/actions-312.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
index 33751c8262063..95cd1a4d46ef4 100644
--- a/ci/deps/actions-311.yaml
+++ b/ci/deps/actions-311.yaml
@@ -14,7 +14,6 @@ dependencies:
   - pytest>=7.3.2
   - pytest-cov
   - pytest-xdist>=2.2.0
-  - pytest-localserver>=0.7.1
   - pytest-qt>=4.2.0
   - boto3
 
diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml
index 96422c752ddcf..a442ed6feeb5d 100644
--- a/ci/deps/actions-312.yaml
+++ b/ci/deps/actions-312.yaml
@@ -14,7 +14,6 @@ dependencies:
   - pytest>=7.3.2
   - pytest-cov
   - pytest-xdist>=2.2.0
-  - pytest-localserver>=0.7.1
   - pytest-qt>=4.2.0
   - boto3
 

From e96a2bf4b30fdb3365853407eeadce0edeffd96f Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:47:31 -0500
Subject: [PATCH 04/11] more CI adjustments and try to fix wheel builders

---
 .github/workflows/unit-tests.yml | 2 +-
 .github/workflows/wheels.yml     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 1b4aa3fe0b1bc..bb1ba020b7ad5 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -229,7 +229,7 @@ jobs:
       PYTEST_TARGET: pandas
       PATTERN: "not slow and not db and not network and not single_cpu"
       # GH 47443: PYTEST_WORKERS > 0 crashes Windows builds with memory related errors
-      PYTEST_WORKERS: ${{ matrix.os == 'macos-latest' && 'auto' || '0' }}
+      PYTEST_WORKERS: ${{ startsWith(matrix.os, 'macos-latest') && 'auto' || '0' }}
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b06638a98f793..16b2525f58e12 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -139,6 +139,10 @@ jobs:
         shell: bash -el {0}
         run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
 
+      - name: Install pipx
+        if: ${{ matrix.buildplat[1] == 'macosx_arm64' }}
+        run: brew install pipx && pipx ensurepath
+
       - name: Build normal wheels
         if: ${{ (env.IS_SCHEDULE_DISPATCH != 'true' || env.IS_PUSH == 'true') }}
         uses: pypa/cibuildwheel@v2.16.4

From e9b0d82d42ab707b4eb8ee08e2a248bd427ef1bd Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:52:26 -0500
Subject: [PATCH 05/11] more fixes

---
 .github/workflows/unit-tests.yml | 5 +++--
 .github/workflows/wheels.yml     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index bb1ba020b7ad5..f7e5b994d6e9a 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -229,7 +229,7 @@ jobs:
       PYTEST_TARGET: pandas
       PATTERN: "not slow and not db and not network and not single_cpu"
       # GH 47443: PYTEST_WORKERS > 0 crashes Windows builds with memory related errors
-      PYTEST_WORKERS: ${{ startsWith(matrix.os, 'macos-latest') && 'auto' || '0' }}
+      PYTEST_WORKERS: ${{ startsWith(matrix.os, 'macos') && 'auto' || '0' }}
 
     steps:
       - name: Checkout
@@ -355,7 +355,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macOS-latest, windows-latest]
+        # Separate out macOS 13 and 14, since macOS 14 is arm64 only
+        os: [ubuntu-22.04, macOS-13, macOS-14, windows-latest]
 
     timeout-minutes: 90
 
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 16b2525f58e12..f4d960e6dfef5 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -130,7 +130,7 @@ jobs:
       # Python version used to build sdist doesn't matter
       # wheel will be built from sdist with the correct version
       - name: Unzip sdist (macOS)
-        if: ${{ matrix.buildplat[1] == 'macosx_*' }}
+        if: ${{ startsWith(matrix.buildplat[1], 'macosx') }}
         run: |
           tar -xzf ./dist/${{ env.sdist_name }} -C ./dist
 
@@ -147,7 +147,7 @@ jobs:
         if: ${{ (env.IS_SCHEDULE_DISPATCH != 'true' || env.IS_PUSH == 'true') }}
         uses: pypa/cibuildwheel@v2.16.4
         with:
-         package-dir: ./dist/${{ matrix.buildplat[1] == 'macosx_*' && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
+         package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
         env:
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
@@ -156,7 +156,7 @@ jobs:
         if: ${{ (env.IS_SCHEDULE_DISPATCH == 'true' && env.IS_PUSH != 'true') }}
         uses: pypa/cibuildwheel@v2.16.4
         with:
-         package-dir: ./dist/${{ matrix.buildplat[1] == 'macosx_*' && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
+         package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
         env:
           # The nightly wheels should be build witht he NumPy 2.0 pre-releases
           # which requires the additional URL.

From 058f63cb443f39c302e3433d0958520b5617dc5e Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:56:10 -0500
Subject: [PATCH 06/11] auto workers on windows as well

---
 .github/workflows/unit-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index f7e5b994d6e9a..4c7aa1e1e49ee 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -228,8 +228,7 @@ jobs:
       PANDAS_CI: 1
       PYTEST_TARGET: pandas
       PATTERN: "not slow and not db and not network and not single_cpu"
-      # GH 47443: PYTEST_WORKERS > 0 crashes Windows builds with memory related errors
-      PYTEST_WORKERS: ${{ startsWith(matrix.os, 'macos') && 'auto' || '0' }}
+      PYTEST_WORKERS: 'auto'
 
     steps:
       - name: Checkout

From 9b4103465794986db532915bf0f7f005ec0a6db8 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:27:31 -0500
Subject: [PATCH 07/11] fix wheel builders

---
 .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 f4d960e6dfef5..b210f12797a98 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -197,7 +197,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.python[0] }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }}
+          name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
           path: ./wheelhouse/*.whl
 
       - name: Upload wheels & sdist

From 59a17de86908b216eaf2dce9843207a1cf2fdc65 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Wed, 31 Jan 2024 23:36:23 -0500
Subject: [PATCH 08/11] Update wheels.yml

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

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b210f12797a98..d617472ca537c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -139,6 +139,8 @@ jobs:
         shell: bash -el {0}
         run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
 
+      # TODO: can remove if https://github.com/actions/runner-images/issues/9256
+      # is resolved
       - name: Install pipx
         if: ${{ matrix.buildplat[1] == 'macosx_arm64' }}
         run: brew install pipx && pipx ensurepath

From 5ae83e1dd04096d0ee15eefbe2c8fefd39de0cca Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 1 Feb 2024 08:17:35 -0500
Subject: [PATCH 09/11] bump cibuildwheel

---
 .github/workflows/wheels.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d617472ca537c..68a24c6f77200 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -139,12 +139,6 @@ jobs:
         shell: bash -el {0}
         run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
 
-      # TODO: can remove if https://github.com/actions/runner-images/issues/9256
-      # is resolved
-      - name: Install pipx
-        if: ${{ matrix.buildplat[1] == 'macosx_arm64' }}
-        run: brew install pipx && pipx ensurepath
-
       - name: Build normal wheels
         if: ${{ (env.IS_SCHEDULE_DISPATCH != 'true' || env.IS_PUSH == 'true') }}
         uses: pypa/cibuildwheel@v2.16.4
@@ -156,7 +150,7 @@ jobs:
 
       - name: Build nightly wheels (with NumPy pre-release)
         if: ${{ (env.IS_SCHEDULE_DISPATCH == 'true' && env.IS_PUSH != 'true') }}
-        uses: pypa/cibuildwheel@v2.16.4
+        uses: pypa/cibuildwheel@v2.16.5
         with:
          package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
         env:

From ae97358037d9502be29d2d896e7bb84729dc0051 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 1 Feb 2024 09:10:38 -0500
Subject: [PATCH 10/11] bump both

---
 .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 68a24c6f77200..f7660515a3f57 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -141,7 +141,7 @@ jobs:
 
       - name: Build normal wheels
         if: ${{ (env.IS_SCHEDULE_DISPATCH != 'true' || env.IS_PUSH == 'true') }}
-        uses: pypa/cibuildwheel@v2.16.4
+        uses: pypa/cibuildwheel@v2.16.5
         with:
          package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
         env:

From c0ede62636ed73e9588c9c2041b3dbee7fd8b444 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 1 Feb 2024 18:44:35 -0500
Subject: [PATCH 11/11] maybe fix windows as well

---
 .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 f7660515a3f57..f79b2c51b5f92 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -185,7 +185,7 @@ jobs:
           $TST_CMD = @"
           python -m pip install hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0;
           python -m pip install `$(Get-Item pandas\wheelhouse\*.whl);
-          python -c `'import pandas as pd; pd.test(extra_args=[\"`\"--no-strict-data-files`\"\", \"`\"-m not clipboard and not single_cpu and not slow and not network and not db`\"\"])`';
+          python -c `'import pandas as pd; pd.test(extra_args=[`\"--no-strict-data-files`\", `\"-m not clipboard and not single_cpu and not slow and not network and not db`\"])`';
           "@
           # add rc to the end of the image name if the Python version is unreleased
           docker pull python:${{ matrix.python[1] == '3.12' && '3.12-rc' || format('{0}-windowsservercore', matrix.python[1]) }}