Changes for the release v2.5.0rc3 (confluentinc#1776)

pranavrth · web-flow · commit 1d0c6dce8396 · 2024-07-09T18:48:57.000+02:00
* Changes for the release v2.5.0rc3
* Removed support for centos6 and centos7
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.4.0
+      value: v2.5.0-RC3
   prologue:
     commands:
       - checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,15 +4,17 @@
 
 v2.5.0 is a feature release with the following features, fixes and enhancements:
 
- - [KIP-107](https://cwiki.apache.org/confluence/display/KAFKA/KIP-107%3A+Add+deleteRecordsBefore%28%29+API+in+AdminClient) Added delete_records API (#1710)
- - Added an example to show the usage of the custom logger with `AdminClient` 
- - Removed usage of `strcpy` to enhance security of the client (#1745)
- - Fixed invalid write in `OAUTHBEARER/OIDC` extensions copy (#1745)
- - Fixed documentation for default value of `operation_timeout` and `request_timeout` in various Admin apis (#1710)
- - Fixed an issue related to import error of `TopicCollection` and `TopicPartitionInfo` classes when importing through other module like mypy.
- - Fixed a segfault when `commit` or `store_offsets` consumer method is called incorrectly with errored Message object
- - Fixed `logger` not working when provided as an argument to `AdminClient` instead of a configuration property
- - Fixed some memory leaks related to `PyDict_SetItem`.
+ - [KIP-107](https://cwiki.apache.org/confluence/display/KAFKA/KIP-107%3A+Add+deleteRecordsBefore%28%29+API+in+AdminClient) Added delete_records API. (#1710)
+ - Added an example to show the usage of the custom logger with `AdminClient`. (#1758)
+ - Improve caching on Schema Registry client. (#1744)
+ - Removed usage of `strcpy` to enhance security of the client. (#1745)
+ - Removed support for centos6 and centos7. (#1776)
+ - Fixed invalid write in `OAUTHBEARER/OIDC` extensions copy. (#1745)
+ - Fixed documentation for default value of `operation_timeout` and `request_timeout` in various Admin apis. (#1710)
+ - Fixed an issue related to import error of `TopicCollection` and `TopicPartitionInfo` classes when importing through other module like mypy. (#1764)
+ - Fixed a segfault when `commit` or `store_offsets` consumer method is called incorrectly with errored Message object. (#1754)
+ - Fixed `logger` not working when provided as an argument to `AdminClient` instead of a configuration property. (#1758)
+ - Fixed some memory leaks related to `PyDict_SetItem`. (#1710)
 
 confluent-kafka-python is based on librdkafka v2.5.0, see the
 [librdkafka release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.5.0)
diff --git a/docs/conf.py b/docs/conf.py
@@ -28,14 +28,14 @@
 ######################################################################
 # General information about the project.
 project = u'confluent-kafka'
-copyright = u'2016-2023, Confluent Inc.'
+copyright = u'2016-2024, Confluent Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.4.0'
+version = '2.5.0.rc3'
 # 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.4.0
+ENV LIBRDKAFKA_VERSION v2.5.0-RC3
 ENV KAFKACAT_VERSION master
 
 
diff --git a/setup.py b/setup.py
@@ -75,7 +75,7 @@ def get_install_requirements(path):
 setup(name='confluent-kafka',
       # Make sure to bump CFL_VERSION* in confluent_kafka/src/confluent_kafka.h
       # and version in docs/conf.py.
-      version='2.4.0',
+      version='2.5.0.rc3',
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='support@confluent.io',
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     0x02040000
-#define CFL_VERSION_STR "2.4.0"
+#define CFL_VERSION     0x02050000
+#define CFL_VERSION_STR "2.5.0.rc3"
 
 /**
  * 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 0x020400ff
+#define MIN_RD_KAFKA_VERSION 0x020500ff
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.4.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.5.0 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.4.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.5.0 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.4.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.5.0 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.4.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.5.0 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/tools/wheels/install-librdkafka.sh b/tools/wheels/install-librdkafka.sh
@@ -32,7 +32,7 @@ if [[ $OSTYPE == linux* ]]; then
     if [[ $ARCH == arm64* ]]; then
         cp -v runtimes/linux-$ARCH/native/{librdkafka.so,librdkafka.so.1}
     else
-        cp -v runtimes/linux-$ARCH/native/{centos6-librdkafka.so,librdkafka.so.1}
+        cp -v runtimes/linux-$ARCH/native/{centos8-librdkafka.so,librdkafka.so.1}
     fi
     ldd runtimes/linux-$ARCH/native/librdkafka.so.1
 
