mgrimal
diff --git a/‎.travis.yml
Lines changed: 3 additions & 9 deletions b/‎.travis.yml
Lines changed: 3 additions & 9 deletions
diff --git a/‎README.md
Lines changed: 3 additions & 8 deletions b/‎README.md
Lines changed: 3 additions & 8 deletions
diff --git a/‎confluent_kafka/__init__.py
Lines changed: 27 additions & 2 deletions b/‎confluent_kafka/__init__.py
Lines changed: 27 additions & 2 deletions
@@ -6,18 +6,12 @@ matrix:
     dist: trusty
     python: "2.7"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=master
-  # Source package verification with Python 2.7 and librdkafka v0.9.5
+  # Source package verification with Python 3.6 and librdkafka master
   - os: linux
     language: python
     dist: trusty
-    python: "2.7"
-    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.9.5
-  # Source package verification with Python 3.5 and librdkafka master
-  - os: linux
-    language: python
-    dist: trusty
-    python: "3.5"
-    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.9.5
+    python: "3.6"
+    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=master
   # cibuildwheel for osx
   - os: osx
     env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl master tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
 
@@ -240,7 +240,7 @@ Prerequisites
 =============
 
  * Python >= 2.7 or Python 3.x
- * [librdkafka](https://github.com/edenhill/librdkafka) >= 0.9.5 (latest release is embedded in wheels)
+ * [librdkafka](https://github.com/edenhill/librdkafka) >= 0.11.5 (latest release is embedded in wheels)
 
 librdkafka is embedded in the macosx manylinux wheels, for other platforms, SASL Kerberos/GSSAPI support or
 when a specific version of librdkafka is desired, following these guidelines:
@@ -277,14 +277,9 @@ In order to run full test suite, simply execute:
 **NOTE**: Requires `tox` (please install with `pip install tox`), several supported versions of Python on your path, and `librdkafka` [installed](tools/bootstrap-librdkafka.sh) into `tmp-build`.
 
 
-**Run integration tests:**
-
-To run the integration tests, uncomment the following line from `tox.ini` and add the paths to your Kafka and Confluent Schema Registry instances. You can also run the integration tests outside of `tox` by running this command from the source root.
-
-    examples/integration_test.py <kafka-broker> [<test-topic>] [<schema-registry>]
-
-**WARNING**: These tests require an active Kafka cluster and will create new topics.
+**Integration tests:**
 
+See [tests/README.md](tests/README.md) for instructions on how to run integration tests.
 
 
 
 
@@ -1,4 +1,4 @@
-__all__ = ['cimpl', 'avro', 'kafkatest']
+__all__ = ['cimpl', 'admin', 'avro', 'kafkatest']
 from .cimpl import (Consumer,  # noqa
                     KafkaError,
                     KafkaException,
@@ -15,5 +15,30 @@
                     OFFSET_STORED,
                     OFFSET_INVALID)
 
-
 __version__ = version()[0]
+
+
+class ThrottleEvent (object):
+    """
+    ThrottleEvent contains details about a throttled request.
+    Set up a throttle callback by setting the ``throttle_cb`` configuration
+    property to a callable that takes a ThrottleEvent object as its only argument.
+    The callback will be triggered from poll(), consume() or flush() when a request
+    has been throttled by the broker.
+
+    This class is typically not user instantiated.
+
+    :ivar str broker_name: The hostname of the broker which throttled the request
+    :ivar int broker_id: The broker id
+    :ivar float throttle_time: The amount of time (in seconds) the broker throttled (delayed) the request
+    """
+    def __init__(self, broker_name,
+                 broker_id,
+                 throttle_time):
+
+        self.broker_name = broker_name
+        self.broker_id = broker_id
+        self.throttle_time = throttle_time
+
+    def __str__(self):
+        return "{}/{} throttled for {} ms".format(self.broker_name, self.broker_id, int(self.throttle_time * 1000))