Bump to 1.6.0 (and librdkafka v1.6.0-RC1)

edenhill · edenhill · commit c05ede331876 · 2021-01-07T10:11:17.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.5.2
+    LIBRDKAFKA_NUGET_VERSION: 1.6.0-RC1
     CIBW_SKIP: cp33-* cp34-*
     CIBW_TEST_REQUIRES: pytest pytest-timeout requests trivup
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
  global:
-  - LIBRDKAFKA_VERSION=v1.5.2
+  - LIBRDKAFKA_VERSION=v1.6.0-RC1
 jobs:
  include:
   - name: "Source package verification with Python 2.7 (Linux)"
diff --git a/docs/conf.py b/docs/conf.py
@@ -57,7 +57,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.5.2'
+version = '1.6.0'
 # 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 v1.5.2
+ENV LIBRDKAFKA_VERSION v1.6.0-RC1
 ENV KAFKACAT_VERSION master
 
 
diff --git a/setup.py b/setup.py
@@ -76,7 +76,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 and release in docs/conf.py.
-      version='1.5.2',
+      version='1.6.0',
       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     0x01050200
-#define CFL_VERSION_STR "1.5.2"
+#define CFL_VERSION     0x01060000
+#define CFL_VERSION_STR "1.6.0"
 
 /**
  * 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 0x01040000
+#define MIN_RD_KAFKA_VERSION 0x01060000
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v1.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 v1.6.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 v1.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 v1.6.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 v1.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 v1.6.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 v1.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 v1.6.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`# built documents.`
`58`	`58`	`#`
`59`	`59`	`# The short X.Y version.`
`60`		`-version = '1.5.2'`
	`60`	`+version = '1.6.0'`
`61`	`61`	`# The full version, including alpha/beta/rc tags.`
`62`	`62`	`release = version`
`63`	`63`