[Python-modules-commits] [python-confluent-kafka] 04/06: merge patched into master

[Christos Trochalakis]

This is an automated email from the git hooks/post-receive script.

ctrochalakis pushed a commit to tag debian/0.9.2-1
in repository python-confluent-kafka.

commit d423235e725bd7264a84dd3923788158deb9d529
Merge: d291e7c 7d4f3ad
Author: Christos Trochalakis <yatiohi at ideopolis.gr>
Date:   Thu Jan 12 15:04:30 2017 +0200

    merge patched into master

 PKG-INFO                                           |   2 +-
 README.md                                          |  35 ++++-
 confluent_kafka.egg-info/PKG-INFO                  |   2 +-
 confluent_kafka.egg-info/SOURCES.txt               |  10 +-
 confluent_kafka/src/Consumer.c                     | 169 +++++++++++---------
 confluent_kafka/src/Producer.c                     | 111 ++++++-------
 confluent_kafka/src/confluent_kafka.c              | 173 ++++++++++++++++++---
 confluent_kafka/src/confluent_kafka.h              | 124 ++++++++++-----
 debian/.git-dpm                                    |   6 +-
 .../patches/0001-Switch-to-trove-classifiers.patch |   6 +-
 setup.py                                           |   2 +-
 tests/test_Consumer.py                             |  62 ++++++++
 tests/test_KafkaError.py                           |  30 ++++
 tests/test_Producer.py                             |  38 +++++
 tests/test_TopicPartition.py                       |  38 +++++
 tests/test_docs.py                                 |  29 ++++
 tests/test_enums.py                                |   9 ++
 tests/test_misc.py                                 |  16 ++
 tests/test_threads.py                              |  69 ++++++++
 19 files changed, 731 insertions(+), 200 deletions(-)

diff --cc debian/.git-dpm
index be6815b,0000000..426e2c4
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b5895e22067a690fd5bc65a37cd555cdbb0697ac
- b5895e22067a690fd5bc65a37cd555cdbb0697ac
- ab89e71fb2d0fda472a811916c3e9f5fc0520286
++7d4f3ad05e8d0c3447426adffe7e9d63baf4db33
++7d4f3ad05e8d0c3447426adffe7e9d63baf4db33
++bd39861dc7688213d0d92f04020ccc777f2a5434
 +bd39861dc7688213d0d92f04020ccc777f2a5434
 +python-confluent-kafka_0.9.2.orig.tar.gz
 +55cf3f5eb73dabbe1e627ada3faec3027a060a0c
 +29213
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Switch-to-trove-classifiers.patch
index b180787,0000000..760ecc1
mode 100644,000000..100644
--- a/debian/patches/0001-Switch-to-trove-classifiers.patch
+++ b/debian/patches/0001-Switch-to-trove-classifiers.patch
@@@ -1,21 -1,0 +1,21 @@@
- From b5895e22067a690fd5bc65a37cd555cdbb0697ac Mon Sep 17 00:00:00 2001
- From: Christos Trochalakis <ctrochalakis at debian.org>
++From 7d4f3ad05e8d0c3447426adffe7e9d63baf4db33 Mon Sep 17 00:00:00 2001
++From: Christos Trochalakis <yatiohi at ideopolis.gr>
 +Date: Wed, 7 Sep 2016 12:04:59 +0300
 +Subject: Switch to trove classifiers
 +
 +This avoids shipping a license file in the top directory.
 +---
 + setup.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index dec7d93..27b59fc 100755
++index c1e0d9c..c2d48b2 100755
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -18,4 +18,5 @@ setup(name='confluent-kafka',
 +       url='https://github.com/confluentinc/confluent-kafka-python',
 +       ext_modules=[module],
 +       packages=find_packages(),
 +-      data_files = [('', ['LICENSE'])])
 ++      classifiers=['License :: OSI Approved :: Apache Software License']
 ++)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-confluent-kafka.git