librdkafka version v1.3.0

rnpridgeon · rnpridgeon · commit afea37aed1c7 · 2019-12-12T21:54:50.000-05:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.3.0-RC3
+    LIBRDKAFKA_NUGET_VERSION: 1.3.0
     CIBW_SKIP: cp33-* cp34-*
     CIBW_TEST_REQUIRES: pytest requests avro
     # 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.3.0-RC3
+  - LIBRDKAFKA_VERSION=v1.3.0
 matrix:
  include:
   # Source package verification with Python 2.7
diff --git a/confluent_kafka/__init__.py b/confluent_kafka/__init__.py
@@ -6,7 +6,6 @@
                     Producer,
                     TopicPartition,
                     libversion,
-                    version,
                     TIMESTAMP_NOT_AVAILABLE,
                     TIMESTAMP_CREATE_TIME,
                     TIMESTAMP_LOG_APPEND_TIME,
@@ -15,7 +14,18 @@
                     OFFSET_STORED,
                     OFFSET_INVALID)
 
-__version__ = version()[0]
+__version__ = '1.3.0'
+
+
+def version():
+    """
+     Version hex representation
+     0xMMmmRRPP
+     MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
+    """
+    int_ver = map(int, __version__.split('.'))
+    return (__version__,
+            "{0:#04x}{1:02x}{2:02x}00".format(*int_ver))
 
 
 class ThrottleEvent (object):
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -2187,14 +2187,6 @@ static PyObject *libversion (PyObject *self, PyObject *args) {
 			     rd_kafka_version());
 }
 
-/*
- * Version hex representation
- * 0xMMmmRRPP
- * MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
- */
-static PyObject *version (PyObject *self, PyObject *args) {
-	return Py_BuildValue("si", "1.3.0", 0x01030000);
-}
 
 static PyMethodDef cimpl_methods[] = {
 	{"libversion", libversion, METH_NOARGS,
@@ -2204,13 +2196,6 @@ static PyMethodDef cimpl_methods[] = {
 	 "  :rtype: tuple(str,int)\n"
 	 "\n"
 	},
-	{"version", version, METH_NOARGS,
-	 "  Retrieve module version string and integer\n"
-	 "\n"
-	 "  :returns: (version_string, version_int) tuple\n"
-	 "  :rtype: tuple(str,int)\n"
-	 "\n"
-	},
 	{ NULL }
 };
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -15,6 +15,7 @@
 import sys
 import os
 from glob import glob
+from confluent_kafka import __version__
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -55,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.0'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '1.3.0'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 
-import os
-from setuptools import setup, find_packages
 from distutils.core import Extension
 import platform
+import os
+from setuptools import setup, find_packages
+
+from confluent_kafka import __version__
 
 INSTALL_REQUIRES = [
     'futures;python_version<"3.2"',
@@ -52,7 +54,7 @@ def get_install_requirements(path):
 
 
 setup(name='confluent-kafka',
-      version='1.3.0',
+      version=__version__,
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='support@confluent.io',
