Release v2.6.1rc2 (confluentinc#1854)

pranavrth · web-flow · commit a29ecb949928 · 2024-11-18T22:18:59.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ tmp-KafkaCluster
 .venv
 venv_test
 venv_examples
+*Zone.Identifier
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -8,7 +8,7 @@ execution_time_limit:
 global_job_config:
   env_vars:
     - name: LIBRDKAFKA_VERSION
-      value: v2.6.0
+      value: v2.6.1-RC2
   prologue:
     commands:
       - checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@
 
 v2.6.1 is a maintenance release with the following fixes and enhancements:
 
- - Migrated build system from `setup.py` to `pyproject.toml` in accordance with `PEP 517` and `PEP 518`, improving project configuration, build system requirements management, and compatibility with modern Python packaging tools like `pip` and `build`.
+ - Migrated build system from `setup.py` to `pyproject.toml` in accordance with `PEP 517` and `PEP 518`, improving project configuration, build system requirements management, and compatibility with modern Python packaging tools like `pip` and `build`. (#1592)
+ - Removed python 3.6 support. (#1592)
  - Added an example for OAUTH OIDC producer with support for confluent cloud (#1769, @sarwarbhuiyan)
 
 confluent-kafka-python is based on librdkafka v2.6.1, see the
diff --git a/docs/conf.py b/docs/conf.py
@@ -27,7 +27,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.6.0'
+version = '2.6.1rc2'
 # The full version, including alpha/beta/rc tags.
 release = version
 ######################################################################
diff --git a/examples/docker/Dockerfile.alpine b/examples/docker/Dockerfile.alpine
@@ -30,7 +30,7 @@ FROM alpine:3.12
 
 COPY . /usr/src/confluent-kafka-python
 
-ENV LIBRDKAFKA_VERSION v2.6.0
+ENV LIBRDKAFKA_VERSION v2.6.1-RC2
 ENV KAFKACAT_VERSION master
 
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "confluent-kafka"
-version = "2.6.0.post1.dev1"
+version = "2.6.1rc2"
 description = "Confluent's Python client for Apache Kafka"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
diff --git a/src/confluent_kafka/src/confluent_kafka.h b/src/confluent_kafka/src/confluent_kafka.h
@@ -42,28 +42,28 @@
  *  0xMMmmRRPP
  *  MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
  */
-#define CFL_VERSION     0x02060000
-#define CFL_VERSION_STR "2.6.0"
+#define CFL_VERSION     0x02060100
+#define CFL_VERSION_STR "2.6.1rc2"
 
 /**
  * Minimum required librdkafka version. This is checked both during
  * build-time (just below) and runtime (see confluent_kafka.c).
  * Make sure to keep the MIN_RD_KAFKA_VERSION, MIN_VER_ERRSTR and #error
  * defines and strings in sync.
  */
-#define MIN_RD_KAFKA_VERSION 0x020600ff
+#define MIN_RD_KAFKA_VERSION 0x020601ff
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.6.0 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
+#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.6.1 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
 #else
-#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.6.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
+#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.6.1 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 
 #if RD_KAFKA_VERSION < MIN_RD_KAFKA_VERSION
 #ifdef __APPLE__
-#error "confluent-kafka-python requires librdkafka v2.6.0 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
+#error "confluent-kafka-python requires librdkafka v2.6.1 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
 #else
-#error "confluent-kafka-python requires librdkafka v2.6.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
+#error "confluent-kafka-python requires librdkafka v2.6.1 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 #endif
 
diff --git a/tests/common/__init__.py b/tests/common/__init__.py
@@ -17,18 +17,12 @@
 #
 
 import os
-from confluent_kafka import Consumer, DeserializingConsumer
-from confluent_kafka.avro import AvroConsumer
+from confluent_kafka import Consumer
 
 _GROUP_PROTOCOL_ENV = 'TEST_CONSUMER_GROUP_PROTOCOL'
 _TRIVUP_CLUSTER_TYPE_ENV = 'TEST_TRIVUP_CLUSTER_TYPE'
 
 
-def _update_conf_group_protocol(conf=None):
-    if conf is not None and 'group.id' in conf and TestUtils.use_group_protocol_consumer():
-        conf['group.protocol'] = 'consumer'
-
-
 def _trivup_cluster_type_kraft():
     return _TRIVUP_CLUSTER_TYPE_ENV in os.environ and os.environ[_TRIVUP_CLUSTER_TYPE_ENV] == 'kraft'
 
@@ -42,20 +36,13 @@ def use_kraft():
     def use_group_protocol_consumer():
         return _GROUP_PROTOCOL_ENV in os.environ and os.environ[_GROUP_PROTOCOL_ENV] == 'consumer'
 
+    @staticmethod
+    def update_conf_group_protocol(conf=None):
+        if conf is not None and 'group.id' in conf and TestUtils.use_group_protocol_consumer():
+            conf['group.protocol'] = 'consumer'
+
 
 class TestConsumer(Consumer):
     def __init__(self, conf=None, **kwargs):
-        _update_conf_group_protocol(conf)
+        TestUtils.update_conf_group_protocol(conf)
         super(TestConsumer, self).__init__(conf, **kwargs)
-
-
-class TestDeserializingConsumer(DeserializingConsumer):
-    def __init__(self, conf=None, **kwargs):
-        _update_conf_group_protocol(conf)
-        super(TestDeserializingConsumer, self).__init__(conf, **kwargs)
-
-
-class TestAvroConsumer(AvroConsumer):
-    def __init__(self, conf=None, **kwargs):
-        _update_conf_group_protocol(conf)
-        super(TestAvroConsumer, self).__init__(conf, **kwargs)
diff --git a/tests/common/schema_registry/__init__.py b/tests/common/schema_registry/__init__.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2024 Confluent Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from confluent_kafka import DeserializingConsumer
+from confluent_kafka.avro import AvroConsumer
+from tests.common import TestUtils
+
+
+class TestDeserializingConsumer(DeserializingConsumer):
+    def __init__(self, conf=None, **kwargs):
+        TestUtils.update_conf_group_protocol(conf)
+        super(TestDeserializingConsumer, self).__init__(conf, **kwargs)
+
+
+class TestAvroConsumer(AvroConsumer):
+    def __init__(self, conf=None, **kwargs):
+        TestUtils.update_conf_group_protocol(conf)
+        super(TestAvroConsumer, self).__init__(conf, **kwargs)
diff --git a/tests/integration/admin/__init__.py b/tests/integration/admin/__init__.py
diff --git a/tests/integration/cluster_fixture.py b/tests/integration/cluster_fixture.py
@@ -25,7 +25,8 @@
 from confluent_kafka.admin import AdminClient, NewTopic
 from confluent_kafka.schema_registry.schema_registry_client import SchemaRegistryClient
 
-from tests.common import TestDeserializingConsumer, TestConsumer
+from tests.common import TestConsumer
+from tests.common.schema_registry import TestDeserializingConsumer
 
 
 class KafkaClusterFixture(object):
diff --git a/tests/integration/integration_test.py b/tests/integration/integration_test.py
@@ -31,7 +31,8 @@
 
 import confluent_kafka
 
-from tests.common import TestConsumer, TestAvroConsumer
+from tests.common import TestConsumer
+from tests.common.schema_registry import TestAvroConsumer
 
 try:
     # Memory tracker
diff --git a/tests/test_log.py b/tests/test_log.py
@@ -7,7 +7,8 @@
 import confluent_kafka.avro
 import confluent_kafka.admin
 
-from tests.common import TestConsumer, TestAvroConsumer
+from tests.common import TestConsumer
+from tests.common.schema_registry import TestAvroConsumer
 
 
 class CountingFilter(logging.Filter):
diff --git a/tools/smoketest.sh b/tools/smoketest.sh
@@ -85,11 +85,13 @@ for py in 3.9 ; do
     # Copy unit tests to temporary directory to avoid any conflicting __pycache__
     # directories from the source tree.
     testdir=$(mktemp -d /tmp/_testdirXXXXXX)
-    cp tests/*.py $testdir/
+    mkdir -p $testdir/tests
+    cp tests/*.py $testdir/tests/
+    cp -r tests/common $testdir/tests/
 
     # Change to a neutral path where there is no confluent_kafka sub-directory
     # that might interfere with module load.
-    pushd $testdir
+    pushd $testdir/tests
     echo "$0: Running unit tests"
     pytest
 
@@ -123,7 +125,7 @@ c = Consumer({"group.id": "test-linux", "plugin.library.paths": "monitoring-inte
         all_fails="$all_fails \[py$py: $fails\]"
     fi
 
-    popd # $testdir
+    popd # $testdir/tests
 done
 
 if [[ -z $pyvers_tested ]]; then

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`# built documents.`
`28`	`28`	`#`
`29`	`29`	`# The short X.Y version.`
`30`		`-version = '2.6.0'`
	`30`	`+version = '2.6.1rc2'`
`31`	`31`	`# The full version, including alpha/beta/rc tags.`
`32`	`32`	`release = version`
`33`	`33`	`######################################################################`