From fc84a4d4cf9254b5716cfaa38df03312d0db18e2 Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Wed, 4 Feb 2026 14:39:39 -0500
Subject: [PATCH 1/3] [DO NOT MERGE] Unpin cibuildwheel

---
 .github/workflows/build_wheels.yml | 2 +-
 sdks/python/build.gradle           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 7bbbb1a2e3db..da8c0bc28889 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -250,7 +250,7 @@ jobs:
       name: Set up QEMU
     - name: Install cibuildwheel
       # note: sync cibuildwheel version with gradle task sdks:python:bdistPy* steps
-      run: pip install cibuildwheel==2.23.3 setuptools
+      run: pip install cibuildwheel setuptools
     - name: Build wheel
       # Only build wheel if it is one of the target versions for this platform, otherwise no-op
       if: ${{ contains(matrix.os_python.python, matrix.py_version) }}
diff --git a/sdks/python/build.gradle b/sdks/python/build.gradle
index 970020da8605..3c9cbf37d775 100644
--- a/sdks/python/build.gradle
+++ b/sdks/python/build.gradle
@@ -220,7 +220,7 @@ platform_identifiers_map.each { platform, idsuffix ->
              args '-c', ". ${envdir}/bin/activate && " +
                  // note: sync cibuildwheel version with GitHub Action
                  // .github/workflows/build_wheel.yml:build_wheels "Install cibuildwheel" step
-                 "pip install cibuildwheel==2.23.3 setuptools && " +
+                 "pip install cibuildwheel setuptools && " +
                  "cibuildwheel --print-build-identifiers --platform ${platform} --archs ${archs} && " +
                  "cibuildwheel --output-dir ${buildDir} --platform ${platform} --archs ${archs} "
            }

From 1dbe65243c06d3a07e04f0f71af821cf9fafffca Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Tue, 10 Feb 2026 13:14:29 -0500
Subject: [PATCH 2/3] pinned version

---
 .github/workflows/build_wheels.yml | 4 ++--
 sdks/python/build.gradle           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index da8c0bc28889..1bd4d297a294 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -244,13 +244,13 @@ jobs:
     - name: Install Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
     - uses: docker/setup-qemu-action@v3
       if: ${{matrix.os_python.arch == 'aarch64'}}
       name: Set up QEMU
     - name: Install cibuildwheel
       # note: sync cibuildwheel version with gradle task sdks:python:bdistPy* steps
-      run: pip install cibuildwheel setuptools
+      run: pip install cibuildwheel==3.3.1 setuptools
     - name: Build wheel
       # Only build wheel if it is one of the target versions for this platform, otherwise no-op
       if: ${{ contains(matrix.os_python.python, matrix.py_version) }}
diff --git a/sdks/python/build.gradle b/sdks/python/build.gradle
index 3c9cbf37d775..2b66459cace5 100644
--- a/sdks/python/build.gradle
+++ b/sdks/python/build.gradle
@@ -220,7 +220,7 @@ platform_identifiers_map.each { platform, idsuffix ->
              args '-c', ". ${envdir}/bin/activate && " +
                  // note: sync cibuildwheel version with GitHub Action
                  // .github/workflows/build_wheel.yml:build_wheels "Install cibuildwheel" step
-                 "pip install cibuildwheel setuptools && " +
+                 "pip install cibuildwheel==${it == '3.10' ? '2.23.3' : '3.3.1'} setuptools && " +
                  "cibuildwheel --print-build-identifiers --platform ${platform} --archs ${archs} && " +
                  "cibuildwheel --output-dir ${buildDir} --platform ${platform} --archs ${archs} "
            }

From 90979a6b3d287aeb0d53e132a5c5d1eef2cfe5cf Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Tue, 10 Feb 2026 13:40:58 -0500
Subject: [PATCH 3/3] move assignment of version

---
 sdks/python/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdks/python/build.gradle b/sdks/python/build.gradle
index 2b66459cace5..6e0786d98553 100644
--- a/sdks/python/build.gradle
+++ b/sdks/python/build.gradle
@@ -200,6 +200,7 @@ platform_identifiers_map.each { platform, idsuffix ->
   }
   getVersionsAsList('python_versions').each { it ->
     def pyversion = it.replace('.', '')
+    def cibuildwheel_version = it == '3.10' ? '2.23.3' : '3.3.1'
 
     project.tasks.register("bdistPy${pyversion}${platform}") {
       description "Build a Python wheel distribution for Py${pyversion} ${platform}"
@@ -220,7 +221,7 @@ platform_identifiers_map.each { platform, idsuffix ->
              args '-c', ". ${envdir}/bin/activate && " +
                  // note: sync cibuildwheel version with GitHub Action
                  // .github/workflows/build_wheel.yml:build_wheels "Install cibuildwheel" step
-                 "pip install cibuildwheel==${it == '3.10' ? '2.23.3' : '3.3.1'} setuptools && " +
+                 "pip install cibuildwheel==${cibuildwheel_version} setuptools && " +
                  "cibuildwheel --print-build-identifiers --platform ${platform} --archs ${archs} && " +
                  "cibuildwheel --output-dir ${buildDir} --platform ${platform} --archs ${archs} "
            }