Bump to v1.5.2 (and librdkafka v1.5.2)

edenhill · edenhill · commit 68de153d94d2 · 2020-10-26T09:14:55.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.5.0
+    LIBRDKAFKA_NUGET_VERSION: 1.5.2
     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.0
+  - LIBRDKAFKA_VERSION=v1.5.2
 jobs:
  include:
   # Source package verification with Python 2.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Confluent's Python client for Apache Kafka
 
+## v1.5.2
+
+v1.5.2 is a maintenance release with the following fixing and enhancements:
+
+ - Add producer purge method with optional blocking argument (@peteryin21, #548)
+ - Add AdminClient.list_groups API (@messense, #948)
+ - Rename asyncio.py example to avoid circular import (#945)
+ - Upgrade bundled OpenSSL to v1.1.1h (from v1.0.2u)
+
+confluent-kafka-python is based on librdkafka v1.5.2, see the
+[librdkafka release notes](https://github.com/edenhill/librdkafka/releases/tag/v1.5.2)
+for a complete list of changes, enhancements, fixes and upgrade considerations.
+
+
+**Note: There was no v1.5.1 release**
+
+
 ## v1.5.0
 
 v1.5.0 is a maintenance release with the following fixes and enhancements:
diff --git a/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h
@@ -41,8 +41,8 @@
  *  0xMMmmRRPP
  *  MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
  */
-#define CFL_VERSION     0x01050000
-#define CFL_VERSION_STR "1.5.0"
+#define CFL_VERSION     0x01050200
+#define CFL_VERSION_STR "1.5.2"
 
 /**
  * Minimum required librdkafka version. This is checked both during
diff --git a/docs/conf.py b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.5.0'
+version = '1.5.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
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.0
+ENV LIBRDKAFKA_VERSION v1.5.2
 ENV KAFKACAT_VERSION master
 
 
diff --git a/setup.py b/setup.py
@@ -64,7 +64,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.0',
+      version='1.5.2',
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='support@confluent.io',
