V1.1.0rc

.appveyor.yml

@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.0.1
+    LIBRDKAFKA_NUGET_VERSION: 1.1.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

.travis.yml

@@ -1,6 +1,6 @@
 env:
  global:
-  - LIBRDKAFKA_VERSION=v1.0.1
+  - LIBRDKAFKA_VERSION=v1.1.0
 matrix:
  include:
   # Source package verification with Python 2.7

confluent_kafka/src/confluent_kafka.c

@@ -2193,7 +2193,7 @@ static PyObject *libversion (PyObject *self, PyObject *args) {
  * MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
  */
 static PyObject *version (PyObject *self, PyObject *args) {
-	return Py_BuildValue("si", "1.0.1", 0x01000100);
+	return Py_BuildValue("si", "1.1.0", 0x01010000);
 }
 
 static PyMethodDef cimpl_methods[] = {

docs/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.1'
+version = '1.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.1'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -38,7 +38,7 @@ def get_install_requirements(path):
 
 
 setup(name='confluent-kafka',
-      version='1.0.1',
+      version='1.1.0',
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='support@confluent.io',

test-requirements.txt

@@ -1,2 +1,2 @@
-pytest
-flake8
+pytest==4.6.4
+flake8

tests/test_Consumer.py

@@ -226,7 +226,7 @@ def test_multiple_close_throw_exception():
 
     with pytest.raises(RuntimeError) as ex:
         c.close()
-    assert 'Consumer already closed' == str(ex.value)
+    assert ex.match('Consumer already closed')
 
 
 def test_any_method_after_close_throws_exception():
@@ -244,51 +244,51 @@ def test_any_method_after_close_throws_exception():
 
     with pytest.raises(RuntimeError) as ex:
         c.subscribe(['test'])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.unsubscribe()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.poll()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.consume()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.assign([TopicPartition('test', 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.unassign()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.assignment()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.commit()
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.committed([TopicPartition("test", 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.position([TopicPartition("test", 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.seek([TopicPartition("test", 0, 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         lo, hi = c.get_watermark_offsets(TopicPartition("test", 0))
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
 
 @pytest.mark.skipif(libversion()[1] < 0x000b0000,
@@ -308,16 +308,16 @@ def test_calling_store_offsets_after_close_throws_erro():
 
     with pytest.raises(RuntimeError) as ex:
         c.store_offsets(offsets=[TopicPartition("test", 0, 42)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
     with pytest.raises(RuntimeError) as ex:
         c.offsets_for_times([TopicPartition("test", 0)])
-    assert 'Consumer closed' == str(ex.value)
+    assert ex.match('Consumer closed')
 
 
 def test_consumer_withot_groupid():
     """ Consumer should raise exception if group.id is not set """
 
     with pytest.raises(ValueError) as ex:
         Consumer({'bootstrap.servers': "mybroker:9092"})
-    assert 'group.id must be set' in str(ex)
+    assert ex.match('group.id must be set')

tests/test_Producer.py

@@ -118,9 +118,9 @@ def test_produce_headers_should_fail():
                   'error_cb': error_cb,
                   'message.timeout.ms': 10})
 
-    with pytest.raises(NotImplementedError) as e:
+    with pytest.raises(NotImplementedError) as ex:
         p.produce('mytopic', value='somedata', key='a key', headers=[('headerkey', 'headervalue')])
-    assert 'Producer message headers requires confluent-kafka-python built for librdkafka version >=v0.11.4' in str(e)
+    assert ex.match('Producer message headers requires confluent-kafka-python built for librdkafka version >=v0.11.4')
 
 
 def test_subclassing():
@@ -188,6 +188,6 @@ def test_set_invalid_partitioner_murmur():
     """
     Assert invalid partitioner raises KafkaException
     """
-    with pytest.raises(KafkaException) as e:
+    with pytest.raises(KafkaException) as ex:
         Producer({'partitioner': 'murmur'})
-    assert 'Invalid value for configuration property "partitioner": murmur' in str(e)
+    assert ex.match('Invalid value for configuration property "partitioner": murmur')

tools/fixup-wheels.sh

@@ -82,10 +82,12 @@ fixup_wheel_macosx () {
 
         # Change the name to be local
         install_name_tool -id "$lib" $lib
-        if otool -L $lib | grep -q /usr/local/lib/librdkafka.1.dylib ; then
+        # Extract existing(old) reference
+        old=$(otool -L $lib | grep -o '.*librdkafka.1.dylib' | xargs)
+        if [[ ! -z "$old" ]]; then
             # Change the librdkafka reference to load from the same
             # directory as the plugin
-            install_name_tool -change /usr/local/lib/librdkafka.1.dylib '@loader_path/librdkafka.1.dylib' $lib
+            install_name_tool -change "$old" '@loader_path/librdkafka.1.dylib' $lib
             otool -L $lib
         else
             echo "WARNING: couldn't find librdkafka reference in $lib"

tools/install-interceptors.sh

@@ -16,10 +16,10 @@ set -e
 pkgtype=$1
 
 # Confluent Platform release version
-CPVER=5.0
+CPVER=5.2
 
 # confluent-librdkafka-plugins version
-PLUGINVER=0.11.0
+PLUGINVER=0.11.1
 
 # Stage directory for wheels
 stagedir=staging/libs

tox.ini

@@ -18,7 +18,8 @@ commands =
 
 [base]
 deps =
-    pytest
+    # https://docs.pytest.org/en/latest/changelog.html#id53
+    pytest==4.6.4
     pytest-timeout
     fastavro
     requests