diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 876048630..aaae6aebc 100644 --- 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.3.0 + value: v2.4.0 prologue: commands: - checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 85f5ee106..c194809d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Confluent's Python client for Apache Kafka +## v2.4.0 + +v2.4.0 is a feature release with the following features, fixes and enhancements: + + - [KIP-848](https://cwiki.apache.org/confluence/display/KAFKA/KIP-848%3A+The+Next+Generation+of+the+Consumer+Rebalance+Protocol): Added KIP-848 based new consumer group rebalance protocol. The feature is an **Early Access**: not production ready yet. Please refer [detailed doc](https://github.com/confluentinc/librdkafka/blob/master/INTRODUCTION.md#next-generation-of-the-consumer-group-protocol-kip-848) for more information. + - Fix segfault with describe_topics and flaky connection (@lpsinger, #1692) + +confluent-kafka-python is based on librdkafka v2.4.0, see the +[librdkafka release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.4.0) +for a complete list of changes, enhancements, fixes and upgrade considerations. + + ## v2.3.0 v2.3.0 is a feature release with the following features, fixes and enhancements: diff --git a/docs/conf.py b/docs/conf.py index 83e978957..db2fcd106 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -35,7 +35,7 @@ # built documents. # # The short X.Y version. -version = '2.3.0' +version = '2.4.0rc3' # The full version, including alpha/beta/rc tags. release = version ###################################################################### diff --git a/examples/docker/Dockerfile.alpine b/examples/docker/Dockerfile.alpine index 110f8071d..f4c97a52a 100644 --- 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.3.0 +ENV LIBRDKAFKA_VERSION v2.4.0 ENV KAFKACAT_VERSION master diff --git a/setup.py b/setup.py index 819324850..ab768ea8c 100755 --- 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.3.0', + version='2.4.0rc3', 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 index 16cdf3d65..93c37b56a 100644 --- a/src/confluent_kafka/src/confluent_kafka.h +++ b/src/confluent_kafka/src/confluent_kafka.h @@ -42,8 +42,8 @@ * 0xMMmmRRPP * MM=major, mm=minor, RR=revision, PP=patchlevel (not used) */ -#define CFL_VERSION 0x02030000 -#define CFL_VERSION_STR "2.3.0" +#define CFL_VERSION 0x02040000 +#define CFL_VERSION_STR "2.4.0rc3" /** * Minimum required librdkafka version. This is checked both during @@ -51,19 +51,19 @@ * Make sure to keep the MIN_RD_KAFKA_VERSION, MIN_VER_ERRSTR and #error * defines and strings in sync. */ -#define MIN_RD_KAFKA_VERSION 0x020300ff +#define MIN_RD_KAFKA_VERSION 0x020400ff #ifdef __APPLE__ -#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.3.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.4.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.3.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.4.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.3.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.4.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.3.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.4.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html" #endif #endif