From b3423a3c41c0fe13b1b47499f3838eac9b76ec8a Mon Sep 17 00:00:00 2001
From: Corey Christous <cchristous@confluent.io>
Date: Tue, 1 Jul 2025 15:34:22 -0400
Subject: [PATCH 1/4] remove explicit calls to pyenv

---
 .semaphore/semaphore.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 3a6b27126..e1ba251f8 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -31,8 +31,6 @@ blocks:
         - name: Build
           commands:
             - sem-version python 3.11
-            - PYTHON_VERSION=$(pyenv versions --bare | grep '^3.11' | head -n1)
-            - export PATH="$(pyenv root)/versions/$PYTHON_VERSION/bin:$PATH"
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -57,8 +55,6 @@ blocks:
         - name: Build
           commands:
             - sem-version python 3.11
-            - PYTHON_VERSION=$(pyenv versions --bare | grep '^3.11' | head -n1)
-            - export PATH="$(pyenv root)/versions/$PYTHON_VERSION/bin:$PATH"
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}-py313.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313.tgz/
@@ -81,8 +77,6 @@ blocks:
         - name: Build
           commands:
             - sem-version python 3.11
-            - PYTHON_VERSION=$(pyenv versions --bare | grep '^3.11' | head -n1)
-            - export PATH="$(pyenv root)/versions/$PYTHON_VERSION/bin:$PATH"
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -109,8 +103,6 @@ blocks:
         - name: Build
           commands:
             - sem-version python 3.11
-            - PYTHON_VERSION=$(pyenv versions --bare | grep '^3.11' | head -n1)
-            - export PATH="$(pyenv root)/versions/$PYTHON_VERSION/bin:$PATH"
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313.tgz wheelhouse
             - artifact push workflow wheelhouse-macOS-${ARCH}-py313.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313.tgz/

From a9583ba0d4be48515b1dcd0ceba0bce59d86ebe7 Mon Sep 17 00:00:00 2001
From: Matthew Seal <mseal@confluent.io>
Date: Mon, 7 Jul 2025 15:19:51 -0700
Subject: [PATCH 2/4] TEST commit to verify pyenv removal can build tags

---
 .semaphore/semaphore.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index e1ba251f8..7722fc6a3 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -14,9 +14,7 @@ global_job_config:
       - checkout
       - mkdir artifacts
 blocks:
-  - name: "Wheels: OSX x64 - Python 3.6-3.12"
-    run:
-      when: "tag =~ '.*'"
+  - name: "Wheels: OSX x64 - Python 3.6-3.12 -- TEST"
     dependencies: []
     task:
       agent:
@@ -33,10 +31,7 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
-            - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
-  - name: "Wheels: OSX x64 - Python 3.13"
-    run:
-      when: "tag =~ '.*'"
+  - name: "Wheels: OSX x64 - Python 3.13 -- TEST"
     dependencies: []
     task:
       agent:
@@ -57,10 +52,7 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313.tgz wheelhouse
-            - artifact push workflow wheelhouse-macOS-${ARCH}-py313.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313.tgz/
-  - name: "Wheels: OSX arm64 - Python 3.8-3.12"
-    run:
-      when: "tag =~ '.*'"
+  - name: "Wheels: OSX arm64 - Python 3.8-3.12 -- TEST"
     dependencies: []
     task:
       agent:
@@ -79,10 +71,7 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
-            - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
-  - name: "Wheels: OSX arm64 - Python 3.13"
-    run:
-      when: "tag =~ '.*'"
+  - name: "Wheels: OSX arm64 - Python 3.13 -- TEST"
     dependencies: []
     task:
       agent:
@@ -105,7 +94,6 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313.tgz wheelhouse
-            - artifact push workflow wheelhouse-macOS-${ARCH}-py313.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313.tgz/
   - name: "Wheels: Linux arm64"
     run:
       when: "tag =~ '.*'"

From e20580f69f61b1341061f6a142ce6e5aeb6710c5 Mon Sep 17 00:00:00 2001
From: Matthew Seal <mseal@confluent.io>
Date: Tue, 8 Jul 2025 15:13:55 -0700
Subject: [PATCH 3/4] Adding uv pip install for missing pyenv setup

---
 tools/wheels/build-wheels.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh
index 96b6e5a6d..d9af094c9 100755
--- a/tools/wheels/build-wheels.sh
+++ b/tools/wheels/build-wheels.sh
@@ -53,6 +53,9 @@ $this_dir/install-librdkafka.sh $librdkafka_version dest
 
 install_pkgs=cibuildwheel==$cibuildwheel_version
 
+# Ensure we have pip installed if using uv
+uv pip install pip || true
+
 python3 -m pip install ${PIP_INSTALL_OPTS} $install_pkgs ||
     pip3 install ${PIP_INSTALL_OPTS} $install_pkgs
 

From b55d564cfe456e46c3d222110c65a75b80906728 Mon Sep 17 00:00:00 2001
From: Matthew Seal <mseal@confluent.io>
Date: Tue, 8 Jul 2025 15:16:46 -0700
Subject: [PATCH 4/4] Revert "TEST commit to verify pyenv removal can build
 tags"

This reverts commit a9583ba0d4be48515b1dcd0ceba0bce59d86ebe7.
---
 .semaphore/semaphore.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 7722fc6a3..e1ba251f8 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -14,7 +14,9 @@ global_job_config:
       - checkout
       - mkdir artifacts
 blocks:
-  - name: "Wheels: OSX x64 - Python 3.6-3.12 -- TEST"
+  - name: "Wheels: OSX x64 - Python 3.6-3.12"
+    run:
+      when: "tag =~ '.*'"
     dependencies: []
     task:
       agent:
@@ -31,7 +33,10 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
-  - name: "Wheels: OSX x64 - Python 3.13 -- TEST"
+            - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
+  - name: "Wheels: OSX x64 - Python 3.13"
+    run:
+      when: "tag =~ '.*'"
     dependencies: []
     task:
       agent:
@@ -52,7 +57,10 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313.tgz wheelhouse
-  - name: "Wheels: OSX arm64 - Python 3.8-3.12 -- TEST"
+            - artifact push workflow wheelhouse-macOS-${ARCH}-py313.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313.tgz/
+  - name: "Wheels: OSX arm64 - Python 3.8-3.12"
+    run:
+      when: "tag =~ '.*'"
     dependencies: []
     task:
       agent:
@@ -71,7 +79,10 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse 2.16.2
             - tar -czf wheelhouse-macOS-${ARCH}.tgz wheelhouse
-  - name: "Wheels: OSX arm64 - Python 3.13 -- TEST"
+            - artifact push workflow wheelhouse-macOS-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
+  - name: "Wheels: OSX arm64 - Python 3.13"
+    run:
+      when: "tag =~ '.*'"
     dependencies: []
     task:
       agent:
@@ -94,6 +105,7 @@ blocks:
             - sem-version python 3.11
             - PIP_INSTALL_OPTIONS="--user" tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-macOS-${ARCH}-py313.tgz wheelhouse
+            - artifact push workflow wheelhouse-macOS-${ARCH}-py313.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313.tgz/
   - name: "Wheels: Linux arm64"
     run:
       when: "tag =~ '.*'"