Merge remote-tracking branch 'origin/master' into typehinting-kafka

Author: fangnx

.semaphore/semaphore.yml

@@ -8,13 +8,13 @@ execution_time_limit:
 global_job_config:
   env_vars:
     - name: LIBRDKAFKA_VERSION
-      value: v2.12.0
+      value: v2.12.1-RC1
   prologue:
     commands:
       - checkout
       - mkdir artifacts
 blocks:
-  - name: "Wheels: OSX x64 - Python 3.7-3.12"
+  - name: "Wheels: OSX x64 - Python 3.8-3.12"
     run:
       when: "tag =~ '.*'"
     dependencies: []
@@ -34,7 +34,7 @@ blocks:
             - 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"
+  - name: "Wheels: OSX x64 - Python 3.13-3.14"
     run:
       when: "tag =~ '.*'"
     dependencies: []
@@ -50,14 +50,14 @@ blocks:
         - name: CIBW_SKIP
           value: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*
         - name: CIBW_ENVIRONMENT_MACOS
-          value: MACOSX_DEPLOYMENT_TARGET=15
+          value: MACOSX_DEPLOYMENT_TARGET=13
       jobs:
         - name: Build
           commands:
-            - sem-version python 3.11
+            - sem-version python 3.13
             - 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/
+            - tar -czf wheelhouse-macOS-${ARCH}-py313-plus.tgz wheelhouse
+            - artifact push workflow wheelhouse-macOS-${ARCH}-py313-plus.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313-plus.tgz/
   - name: "Wheels: OSX arm64 - Python 3.8-3.12"
     run:
       when: "tag =~ '.*'"
@@ -80,7 +80,7 @@ blocks:
             - 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"
+  - name: "Wheels: OSX arm64 - Python 3.13-3.14"
     run:
       when: "tag =~ '.*'"
     dependencies: []
@@ -98,14 +98,14 @@ blocks:
         - name: CIBW_SKIP
           value: cp38-* cp39-* cp310-* cp311-* cp312-*
         - name: CIBW_ENVIRONMENT_MACOS
-          value: MACOSX_DEPLOYMENT_TARGET=15
+          value: MACOSX_DEPLOYMENT_TARGET=13
       jobs:
         - name: Build
           commands:
-            - sem-version python 3.11
+            - sem-version python 3.13
             - 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/
+            - tar -czf wheelhouse-macOS-${ARCH}-py313-plus.tgz wheelhouse
+            - artifact push workflow wheelhouse-macOS-${ARCH}-py313-plus.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}-py313-plus.tgz/
   - name: "Wheels: Linux arm64"
     run:
       when: "tag =~ '.*'"
@@ -122,6 +122,7 @@ blocks:
       jobs:
         - name: Build
           commands:
+            - sem-version python 3.13
             - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -141,6 +142,7 @@ blocks:
       jobs:
         - name: Build
           commands:
+            - sem-version python 3.11
             - ./tools/wheels/build-wheels.sh "${LIBRDKAFKA_VERSION#v}" wheelhouse
             - tar -czf wheelhouse-linux-${ARCH}.tgz wheelhouse
             - artifact push workflow wheelhouse-linux-${ARCH}.tgz --destination artifacts/wheels-${OS_NAME}-${ARCH}.tgz/
@@ -170,6 +172,8 @@ blocks:
             - name: MSYSTEM
               value: UCRT64
           commands:
+            - pyenv install 3.11.9
+            - pyenv global 3.11.9
             - bash tools/mingw-w64/semaphore_commands.sh
             - bash tools/wheels/install-librdkafka.sh $env:LIBRDKAFKA_VERSION.TrimStart("v") dest
             - tools/wheels/build-wheels.bat x64 win_amd64 dest wheelhouse
@@ -379,10 +383,10 @@ blocks:
     run:
       when: "tag =~ '.*'"
     dependencies:
-      - "Wheels: OSX x64 - Python 3.7-3.12"
-      - "Wheels: OSX x64 - Python 3.13"
+      - "Wheels: OSX x64 - Python 3.8-3.12"
+      - "Wheels: OSX x64 - Python 3.13-3.14"
       - "Wheels: OSX arm64 - Python 3.8-3.12"
-      - "Wheels: OSX arm64 - Python 3.13"
+      - "Wheels: OSX arm64 - Python 3.13-3.14"
       - "Wheels: Linux arm64"
       - "Wheels: Linux x64"
       - "Wheels: Windows"

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Confluent Python Client for Apache Kafka - CHANGELOG
 
+## v2.12.1 - release candidate
+
+v2.12.1 is a maintenance release with the following fixes:
+
+- restored macOS binaries compatibility with macOS 13
+
+
 ## v2.12.0 - 2025-10-09
 
 v2.12.0 is a feature release with the following enhancements:

DEVELOPER.md

@@ -6,7 +6,7 @@ This document provides information useful to developers working on confluent-kaf
 
 ### Prerequisites
 
-- Python 3.7 or higher
+- Python 3.8 or higher
 - Git
 - librdkafka (for Kafka functionality)
 

README.md

@@ -106,7 +106,7 @@ p = Producer({'bootstrap.servers': 'mybroker1,mybroker2'})
 
 def delivery_report(err, msg):
     """ Called once for each message produced to indicate delivery result.
-        Triggered by poll() or flush(). """
+        Triggered by poll() or flush()."""
     if err is not None:
         print('Message delivery failed: {}'.format(err))
     else:

docs/Makefile

@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build

docs/conf.py

@@ -12,7 +12,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sphinx_rtd_theme
 import os
 try:
     import tomllib
@@ -133,7 +132,6 @@ def _read_version_from_pyproject(pyproject_path=None):
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []

examples/docker/Dockerfile.alpine

@@ -30,7 +30,7 @@ FROM alpine:3.12
 
 COPY . /usr/src/confluent-kafka-python
 
-ENV LIBRDKAFKA_VERSION="v2.12.0"
+ENV LIBRDKAFKA_VERSION="v2.12.1-RC1"
 ENV KCAT_VERSION="master"
 ENV CKP_VERSION="master"
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "confluent-kafka"
-version = "2.12.0"
+version = "2.12.1rc1"
 description = "Confluent's Python client for Apache Kafka"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -14,7 +14,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Topic :: Software Development :: Libraries :: Python Modules"]
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 dynamic = ["dependencies", "optional-dependencies"]
 
 [[project.authors]]

requirements/requirements-docs.txt

@@ -1,4 +1,4 @@
 sphinx
 sphinx-rtd-theme
-tomli; python_version < "3.13"
+tomli; python_version < "3.11"
 pandoc

requirements/requirements.txt

@@ -1 +0,0 @@
-tomli; python_version < "3.13"