[Python-modules-commits] [python-pika] 03/09: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository python-pika.

commit 388b1288b18d35d2ccd94c888fc8dd547e2eef63
Merge: f9ddb76 60eafcb
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Wed Sep 27 04:01:05 2017 +0100

    merge patched into master

 .checkignore                                       |    8 +-
 .codeclimate.yml                                   |   14 +-
 .gitignore                                         |    2 +
 .travis.yml                                        |   42 +-
 CHANGELOG.rst                                      |   79 +-
 CONTRIBUTING.md                                    |   45 +
 LICENSE                                            |    2 +-
 README.rst                                         |   37 +-
 appveyor.yml                                       |   86 +
 debian/.git-dpm                                    |    6 +-
 debian/patches/0001-Fix-the-channel-tests.patch    |   54 -
 ...Make-the-test-more-reliable-in-Python-3.5.patch |   27 -
 debian/patches/series                              |    2 -
 docs/examples.rst                                  |    2 +
 docs/examples/asynchronous_publisher_example.rst   |  119 +-
 ..._publisher_example.rst => asyncio_consumer.rst} |  357 ++---
 docs/examples/blocking_basic_get.rst               |    4 +-
 docs/examples/blocking_consume.rst                 |   28 +-
 docs/examples/blocking_consumer_generator.rst      |    8 +-
 docs/examples/blocking_delivery_confirmations.rst  |    4 +-
 docs/examples/blocking_publish_mandatory.rst       |    6 +-
 docs/examples/direct_reply_to.rst                  |   81 +
 docs/examples/heartbeat_and_blocked_timeouts.rst   |   37 +
 docs/examples/tls_mutual_authentication.rst        |   61 +
 docs/examples/tls_server_uathentication.rst        |   60 +
 docs/examples/twisted_example.rst                  |    2 +-
 docs/examples/using_urlparameters.rst              |   15 +-
 docs/intro.rst                                     |   10 +-
 docs/modules/adapters/asyncio.rst                  |    9 +
 docs/version_history.rst                           |   86 +-
 .../{tmp.py => asynchronous_publisher_example.py}  |  272 ++--
 examples/direct_reply_to.py                        |   80 +
 examples/heatbeat_and_blocked_timeouts.py          |   48 +
 examples/send.py                                   |    6 +-
 examples/twisted_service.py                        |    2 +-
 nose.cfg                                           |    3 -
 pika/__init__.py                                   |    2 +-
 pika/adapters/__init__.py                          |   17 +-
 pika/adapters/asyncio_connection.py                |  221 +++
 pika/adapters/base_connection.py                   |  175 ++-
 pika/adapters/blocking_connection.py               |  321 ++--
 pika/adapters/libev_connection.py                  |   43 +-
 pika/adapters/select_connection.py                 |  865 +++++++---
 pika/adapters/tornado_connection.py                |    9 +-
 pika/adapters/twisted_connection.py                |   21 +-
 pika/channel.py                                    |  568 ++++---
 pika/compat.py                                     |   35 +-
 pika/connection.py                                 | 1649 +++++++++++++-------
 pika/credentials.py                                |   16 +
 pika/exceptions.py                                 |   26 +-
 pika/heartbeat.py                                  |   13 +-
 pika/spec.py                                       |   21 +-
 pylintrc                                           |  391 +++++
 setup.cfg                                          |    8 +
 setup.py                                           |    5 +-
 test-requirements.txt                              |    2 +-
 tests/acceptance/async_adapter_tests.py            |  190 ++-
 tests/acceptance/async_test_base.py                |  159 +-
 tests/acceptance/blocking_adapter_test.py          |  328 +++-
 tests/acceptance/enforce_one_basicget_test.py      |   32 +
 tests/acceptance/forward_server.py                 |  238 +--
 tests/acceptance/test_utils.py                     |   73 +
 tests/unit/base_connection_tests.py                |   48 +
 tests/unit/blocking_channel_tests.py               |   24 +-
 tests/unit/blocking_connection_tests.py            |  164 +-
 tests/unit/channel_tests.py                        |  635 +++++---
 tests/unit/connection_parameters_tests.py          |  642 ++++++++
 tests/unit/connection_tests.py                     |  851 +++++++---
 tests/unit/connection_timeout_tests.py             |  149 +-
 ...r_tests.py => content_frame_assembler_tests.py} |   10 +-
 tests/unit/credentials_tests.py                    |  110 ++
 tests/unit/heartbeat_tests.py                      |   21 +-
 tests/unit/parameter_tests.py                      |   69 -
 tests/unit/select_connection_ioloop_tests.py       |  314 +++-
 tests/unit/tornado_tests.py                        |    5 +-
 tests/unit/twisted_tests.py                        |   36 +
 utils/codegen.py                                   |   29 +-
 77 files changed, 7606 insertions(+), 2633 deletions(-)

diff --cc debian/.git-dpm
index c55b5d4,0000000..2782ffd
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
- de39689cab64d0c9505636479632e9ae739f8e30
- de39689cab64d0c9505636479632e9ae739f8e30
- 02aaec8506024857a5c0e715b122cbe0ecb78982
++60eafcb3a71aa6a017e272bd7d1c185a7529b628
++60eafcb3a71aa6a017e272bd7d1c185a7529b628
++60eafcb3a71aa6a017e272bd7d1c185a7529b628
 +60eafcb3a71aa6a017e272bd7d1c185a7529b628
 +python-pika_0.11.0.orig.tar.gz
 +7c6e28833ed503431142076f814040b5ca30fc22
 +218888
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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