From e3a6f1e31ad209554a463e4c78f96e4882fa67f9 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 05:43:03 -0500
Subject: [PATCH 01/15] streamline wheel jobs

---
 .github/workflows/release-python.yml | 63 ++++++++--------------------
 1 file changed, 17 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 0b7a47bd70..c6eec8aa44 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -20,7 +20,7 @@ defaults:
 
 jobs:
   build_wheels:
-    name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+    name: Build wheel for ${{ matrix.buildplat[1] }}
     runs-on: ${{ matrix.buildplat[0] }}
     strategy:
       # Ensure that a wheel builder finishes even if another fails
@@ -29,27 +29,15 @@ jobs:
         # Github Actions doesn't support pairing matrix values together, let's improvise
         # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
         buildplat:
-        - [ubuntu-20.04, manylinux_x86_64]
-        - [ubuntu-20.04, manylinux_aarch64]
-        - [ubuntu-20.04, manylinux_ppc64le]
-        - [ubuntu-20.04, manylinux_s390x]
-        - [ubuntu-20.04, manylinux_i686]
-        - [windows-2019, win_amd64]
-        - [windows-2019, win32]
-        python: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312"]
-        include:
-            - buildplat: [macos-11, macosx_*]
-              python: "cp37"
-            - buildplat: [macos-11, macosx_*]
-              python: "cp38"
-            - buildplat: [macos-11, macosx_*]
-              python: "cp39"
-            - buildplat: [macos-14, macosx_*]
-              python: "cp310"
-            - buildplat: [macos-14, macosx_*]
-              python: "cp311"
-            - buildplat: [macos-14, macosx_*]
-              python: "cp312"
+        - [ubuntu-20.04, "manylinux_x86_64", "cp3*-manylinux_x86_64"]
+        - [ubuntu-20.04, "manylinux_aarch64", "cp3*-manylinux_aarch64"]
+        - [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
+        - [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
+        - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
+        - [windows-2019, "win_amd6", "cp3*-win_amd64"]
+        - [windows-2019, "win32", "cp3*-win32"]
+        - [macos-11, "macos-intel", "cp37-macosx_* cp38-macosx_* cp39-macosx_*"]
+        - [macos-14, "macos-arm", "cp310-macosx_* cp311-macosx_* cp312-macosx_*"]
 
     steps:
       - name: Checkout pymongo
@@ -57,14 +45,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up python version
-        run: |
-          export PYTHON_VERSION=$(sed 's/^cp3/3./' <<< ${{ matrix.python }} )
-          echo "PYTHON_VERSION=$PYTHON_VERSION" >> $GITHUB_ENV
-
       - uses: actions/setup-python@v5
         with:
-          python-version: ${{env.PYTHON_VERSION}}
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
           allow-prereleases: true
@@ -84,19 +66,19 @@ jobs:
       - name: Build wheel
         if: ${{ matrix.buildplat[0] != 'macos-14' }}
         env:
-          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_BUILD: ${{ matrix.buildplat[2] }}
           MACOS_TEST_SKIP: "*arm64"
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build wheel on M1
         if: ${{ matrix.buildplat[0] == 'macos-14' }}
         env:
-          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_BUILD: ${{ matrix.buildplat[2] }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheel-${{ matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }}
+          name: wheel-${{ matrix.buildplat[1] }}
           path: ./wheelhouse/*.whl
           if-no-files-found: error
 
@@ -106,21 +88,15 @@ jobs:
       # Ensure that a wheel builder finishes even if another fails
       fail-fast: false
       matrix:
-        python: ["cp37", "cp38", "cp39"]
+        buildplat: ["manylinux_x86_64", "manylinux_i686"]
     steps:
     - name: Checkout pymongo
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - name: Set up python version
-      run: |
-        export PYTHON_VERSION=$(sed 's/^cp3/3./' <<< ${{ matrix.python }} )
-        echo "PYTHON_VERSION=$PYTHON_VERSION" >> $GITHUB_ENV
-
     - uses: actions/setup-python@v5
       with:
-        python-version: ${{env.PYTHON_VERSION}}
         cache: 'pip'
         cache-dependency-path: 'pyproject.toml'
         allow-prereleases: true
@@ -130,21 +106,16 @@ jobs:
         python -m pip install -U pip
         python -m pip install "cibuildwheel>=2.4,<3"
 
-    - name: Build manylinux_x86_64
+    - name: Build ${{ matrix.buildplat }}
       env:
-        CIBW_BUILD: ${{ matrix.python }}-manylinux_x86_64
+        CIBW_BUILD: "cp37-${{ matrix.buildplat }} cp38-${{ matrix.buildplat }} cp39-${{ matrix.buildplat }}"
         CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-      run: python -m cibuildwheel --output-dir wheelhouse
-
-    - name: Build manylinux_i686
-      env:
-        CIBW_BUILD: ${{ matrix.python }}-manylinux_i686
         CIBW_MANYLINUX_I686_IMAGE: manylinux1
       run: python -m cibuildwheel --output-dir wheelhouse
 
     - uses: actions/upload-artifact@v4
       with:
-        name: wheel-${{ matrix.python }}-manylinux1
+        name: wheel-manylinux1-${{ matrix.buildplat }}
         path: ./wheelhouse/*.whl
         if-no-files-found: error
 

From 129c5eb9bf9f00d31ceb73ec9db7df1d909289b5 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 05:49:51 -0500
Subject: [PATCH 02/15] more streamline

---
 .github/workflows/release-python.yml | 51 ++++++++--------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index c6eec8aa44..de0c00fbfb 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -76,49 +76,26 @@ jobs:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
+      - name: Build manylinux1 x86_64 Wheel
+        if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' }}
+        env:
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
+          CIBW_BUILD: ${{ matrix.buildplat[2] }}
+        run: python -m cibuildwheel --output-dir wheelhouse
+
+      - name: Build manylinux1 i686 Wheel
+        if: ${{ matrix.buildplat[1] == 'manylinux_i686' }}
+        env:
+          CIBW_MANYLINUX_I686_IMAGE: manylinux1
+          CIBW_BUILD: ${{ matrix.buildplat[2] }}
+        run: python -m cibuildwheel --output-dir wheelhouse
+
       - uses: actions/upload-artifact@v4
         with:
           name: wheel-${{ matrix.buildplat[1] }}
           path: ./wheelhouse/*.whl
           if-no-files-found: error
 
-  build_manylinux1_wheels:
-    runs-on: ubuntu-latest
-    strategy:
-      # Ensure that a wheel builder finishes even if another fails
-      fail-fast: false
-      matrix:
-        buildplat: ["manylinux_x86_64", "manylinux_i686"]
-    steps:
-    - name: Checkout pymongo
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - uses: actions/setup-python@v5
-      with:
-        cache: 'pip'
-        cache-dependency-path: 'pyproject.toml'
-        allow-prereleases: true
-
-    - name: Install cibuildwheel
-      run: |
-        python -m pip install -U pip
-        python -m pip install "cibuildwheel>=2.4,<3"
-
-    - name: Build ${{ matrix.buildplat }}
-      env:
-        CIBW_BUILD: "cp37-${{ matrix.buildplat }} cp38-${{ matrix.buildplat }} cp39-${{ matrix.buildplat }}"
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-        CIBW_MANYLINUX_I686_IMAGE: manylinux1
-      run: python -m cibuildwheel --output-dir wheelhouse
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: wheel-manylinux1-${{ matrix.buildplat }}
-        path: ./wheelhouse/*.whl
-        if-no-files-found: error
-
   make_sdist:
     name: Make SDist
     runs-on: macos-13

From f0d07931c21ceb827932215b8ea9e3e2618d06d0 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 05:50:11 -0500
Subject: [PATCH 03/15] more streamline

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

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index de0c00fbfb..1042631bc7 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -128,7 +128,7 @@ jobs:
 
   collect_dist:
     runs-on: ubuntu-latest
-    needs: [build_wheels, build_manylinux1_wheels, make_sdist]
+    needs: [build_wheels, make_sdist]
     name: Download Wheels
     steps:
       - name: Download all workflow run artifacts

From bb661d04ddd65d27a8370c296d996a818c6526ca Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 05:53:50 -0500
Subject: [PATCH 04/15] cleanup

---
 .github/workflows/release-python.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 1042631bc7..30d1b56227 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -20,7 +20,7 @@ defaults:
 
 jobs:
   build_wheels:
-    name: Build wheel for ${{ matrix.buildplat[1] }}
+    name: Build wheels for ${{ matrix.buildplat[1] }}
     runs-on: ${{ matrix.buildplat[0] }}
     strategy:
       # Ensure that a wheel builder finishes even if another fails
@@ -63,31 +63,31 @@ jobs:
           python -m pip install -U pip
           python -m pip install "cibuildwheel>=2.4,<3"
 
-      - name: Build wheel
+      - name: Build wheels
         if: ${{ matrix.buildplat[0] != 'macos-14' }}
         env:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
           MACOS_TEST_SKIP: "*arm64"
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build wheel on M1
+      - name: Build wheels on M1
         if: ${{ matrix.buildplat[0] == 'macos-14' }}
         env:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build manylinux1 x86_64 Wheel
+      - name: Build manylinux1 x86_64 wheels
         if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' }}
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_BUILD: ${{ matrix.buildplat[2] }}
+          CIBW_BUILD: "cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp39-manylinux_x86_64"
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build manylinux1 i686 Wheel
+      - name: Build manylinux1 i686 wheels
         if: ${{ matrix.buildplat[1] == 'manylinux_i686' }}
         env:
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BUILD: ${{ matrix.buildplat[2] }}
+          CIBW_BUILD:  "cp37-manylinux_i686 cp38-manylinux_i686 cp39-manylinux_i686"
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v4

From 5810b1e02beeb94024900d7b588caf79f37ab3d3 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 06:45:15 -0500
Subject: [PATCH 05/15] ensure py312 windows

---
 .github/workflows/release-python.yml | 4 ++--
 .github/workflows/test-python.yml    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 30d1b56227..4e86b57469 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -34,8 +34,8 @@ jobs:
         - [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
         - [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
         - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
-        - [windows-2019, "win_amd6", "cp3*-win_amd64"]
-        - [windows-2019, "win32", "cp3*-win32"]
+        - [windows-2019, "win_amd6", "cp3*-win_amd64 cp312-win_am64"]
+        - [windows-2019, "win32", "cp3*-win32 cp312-win_32"]
         - [macos-11, "macos-intel", "cp37-macosx_* cp38-macosx_* cp39-macosx_*"]
         - [macos-14, "macos-arm", "cp310-macosx_* cp311-macosx_* cp312-macosx_*"]
 
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
index 5df13b950d..31dc018f27 100644
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@@ -2,6 +2,7 @@ name: Python Tests
 
 on:
   push:
+    branches: ["master", "v**"]
   pull_request:
   workflow_dispatch:
 

From 2ab85aa763e58e10ed851fe7c778c7b5a5068927 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 07:34:07 -0500
Subject: [PATCH 06/15] fix win32

---
 .github/workflows/release-python.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 4e86b57469..a133ae6983 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -34,8 +34,8 @@ jobs:
         - [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
         - [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
         - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
-        - [windows-2019, "win_amd6", "cp3*-win_amd64 cp312-win_am64"]
-        - [windows-2019, "win32", "cp3*-win32 cp312-win_32"]
+        - [windows-2019, "win_amd6", "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64"]
+        - [windows-2019, "win32", "cp37-win32 cp38-win32 cp39-win32 cp310-win32 cp311-win32 cp312-win32"]
         - [macos-11, "macos-intel", "cp37-macosx_* cp38-macosx_* cp39-macosx_*"]
         - [macos-14, "macos-arm", "cp310-macosx_* cp311-macosx_* cp312-macosx_*"]
 

From c991fed60c021754e62ff3bee1d1c14902d4b68f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 07:44:16 -0500
Subject: [PATCH 07/15] build windows 3.12 wheels

---
 .github/workflows/release-python.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index a133ae6983..88440273bd 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -34,8 +34,8 @@ jobs:
         - [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
         - [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
         - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
-        - [windows-2019, "win_amd6", "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64"]
-        - [windows-2019, "win32", "cp37-win32 cp38-win32 cp39-win32 cp310-win32 cp311-win32 cp312-win32"]
+        - [windows-2019, "win_amd6", "cp3*-win_amd64"]
+        - [windows-2019, "win32", "cp3*-win32"]
         - [macos-11, "macos-intel", "cp37-macosx_* cp38-macosx_* cp39-macosx_*"]
         - [macos-14, "macos-arm", "cp310-macosx_* cp311-macosx_* cp312-macosx_*"]
 
@@ -76,6 +76,12 @@ jobs:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
+      - name: Build cp312 windows wheels
+        if: ${{ matrix.buildplat[0] == 'windows-2019' }}
+        env:
+          CIBW_BUILD: "cp312-${{ buildplat[1] }}"
+        run: python -m cibuildwheel --output-dir wheelhouse
+
       - name: Build manylinux1 x86_64 wheels
         if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' }}
         env:

From 54799344919e6d5925c9bfdcddbf624d75fad9f9 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 07:44:57 -0500
Subject: [PATCH 08/15] fix matrix

---
 .github/workflows/release-python.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 88440273bd..9831dd78de 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -77,9 +77,9 @@ jobs:
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build cp312 windows wheels
-        if: ${{ matrix.buildplat[0] == 'windows-2019' }}
+        if: startsWith(${{ matrix.buildplat[0]}}, 'windows')
         env:
-          CIBW_BUILD: "cp312-${{ buildplat[1] }}"
+          CIBW_BUILD: "cp312-${{ matrix.buildplat[1] }}"
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build manylinux1 x86_64 wheels

From ca663fbe870cdd4766b17be75bac9d9518b0518e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 07:48:05 -0500
Subject: [PATCH 09/15] fix matrix

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

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 9831dd78de..531264f141 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -77,7 +77,7 @@ jobs:
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build cp312 windows wheels
-        if: startsWith(${{ matrix.buildplat[0]}}, 'windows')
+        if: startsWith("${{ matrix.buildplat[0]}}", 'windows')
         env:
           CIBW_BUILD: "cp312-${{ matrix.buildplat[1] }}"
         run: python -m cibuildwheel --output-dir wheelhouse

From 25cc7ed0f04ad077483dbebc1192295a98e43acd Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 07:51:48 -0500
Subject: [PATCH 10/15] fix matrix

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

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 531264f141..b17ae3458f 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -77,7 +77,7 @@ jobs:
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build cp312 windows wheels
-        if: startsWith("${{ matrix.buildplat[0]}}", 'windows')
+        if: ${{ startsWith(matrix.buildplat[0], 'windows') }}
         env:
           CIBW_BUILD: "cp312-${{ matrix.buildplat[1] }}"
         run: python -m cibuildwheel --output-dir wheelhouse

From 4b6a5885e0779251e09a996bd173a5556c8e8717 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 08:01:45 -0500
Subject: [PATCH 11/15] bump min version

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

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index b17ae3458f..f306f0d4db 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -61,7 +61,7 @@ jobs:
         # Note: the default manylinux is manylinux2014
         run: |
           python -m pip install -U pip
-          python -m pip install "cibuildwheel>=2.4,<3"
+          python -m pip install "cibuildwheel>=2.17,<3"
 
       - name: Build wheels
         if: ${{ matrix.buildplat[0] != 'macos-14' }}
@@ -76,12 +76,6 @@ jobs:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build cp312 windows wheels
-        if: ${{ startsWith(matrix.buildplat[0], 'windows') }}
-        env:
-          CIBW_BUILD: "cp312-${{ matrix.buildplat[1] }}"
-        run: python -m cibuildwheel --output-dir wheelhouse
-
       - name: Build manylinux1 x86_64 wheels
         if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' }}
         env:

From ffad8a02b56079698c62174d59acda1ba3999a80 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 08:04:21 -0500
Subject: [PATCH 12/15] fix python version

---
 .github/workflows/release-python.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index f306f0d4db..8e4cdb4e48 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -48,6 +48,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           cache: 'pip'
+          python-version: 3.8
           cache-dependency-path: 'pyproject.toml'
           allow-prereleases: true
 

From e80b30d70b1d8f3f3849241db85015c26682bb45 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 08:06:25 -0500
Subject: [PATCH 13/15] add assertion

---
 .github/workflows/release-python.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 8e4cdb4e48..aecd124470 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -91,6 +91,15 @@ jobs:
           CIBW_BUILD:  "cp37-manylinux_i686 cp38-manylinux_i686 cp39-manylinux_i686"
         run: python -m cibuildwheel --output-dir wheelhouse
 
+      - name: Assert all versions in wheelhouse
+        run: |
+          ls wheelhouse/*cp37*.whl
+          ls wheelhouse/*cp38*.whl
+          ls wheelhouse/*cp39*.whl
+          ls wheelhouse/*cp310*.whl
+          ls wheelhouse/*cp311*.whl
+          ls wheelhouse/*cp312*.whl
+
       - uses: actions/upload-artifact@v4
         with:
           name: wheel-${{ matrix.buildplat[1] }}

From d5a05dfdfb294c0526b8f86c6cd5f64987e0383e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 08:07:56 -0500
Subject: [PATCH 14/15] add assertion

---
 .github/workflows/release-python.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index aecd124470..f1bf297e2d 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -92,6 +92,7 @@ jobs:
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Assert all versions in wheelhouse
+        if: ${{ ! startsWith(matrix.buildplat[1], 'macos') }}
         run: |
           ls wheelhouse/*cp37*.whl
           ls wheelhouse/*cp38*.whl

From 7f687f82097cbae264030e5c6d98bd564ebb5168 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 29 Apr 2024 09:38:39 -0500
Subject: [PATCH 15/15] more cleanup

---
 .github/workflows/release-python.yml | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index f1bf297e2d..c17d4046e9 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -36,8 +36,7 @@ jobs:
         - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
         - [windows-2019, "win_amd6", "cp3*-win_amd64"]
         - [windows-2019, "win32", "cp3*-win32"]
-        - [macos-11, "macos-intel", "cp37-macosx_* cp38-macosx_* cp39-macosx_*"]
-        - [macos-14, "macos-arm", "cp310-macosx_* cp311-macosx_* cp312-macosx_*"]
+        - [macos-14, "macos", "cp*-macosx_*"]
 
     steps:
       - name: Checkout pymongo
@@ -65,30 +64,16 @@ jobs:
           python -m pip install "cibuildwheel>=2.17,<3"
 
       - name: Build wheels
-        if: ${{ matrix.buildplat[0] != 'macos-14' }}
         env:
           CIBW_BUILD: ${{ matrix.buildplat[2] }}
-          MACOS_TEST_SKIP: "*arm64"
         run: python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build wheels on M1
-        if: ${{ matrix.buildplat[0] == 'macos-14' }}
-        env:
-          CIBW_BUILD: ${{ matrix.buildplat[2] }}
-        run: python -m cibuildwheel --output-dir wheelhouse
-
-      - name: Build manylinux1 x86_64 wheels
-        if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' }}
+      - name: Build manylinux1 wheels
+        if: ${{ matrix.buildplat[1] == 'manylinux_x86_64' || matrix.buildplat[1] == 'manylinux_i686' }}
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-          CIBW_BUILD: "cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp39-manylinux_x86_64"
-        run: python -m cibuildwheel --output-dir wheelhouse
-
-      - name: Build manylinux1 i686 wheels
-        if: ${{ matrix.buildplat[1] == 'manylinux_i686' }}
-        env:
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BUILD:  "cp37-manylinux_i686 cp38-manylinux_i686 cp39-manylinux_i686"
+          CIBW_BUILD: "cp37-${{ matrix.buildplat[1] }} cp38-${{ matrix.buildplat[1] }} cp39-${{ matrix.buildplat[1] }}"
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Assert all versions in wheelhouse