Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-amqp for openSUSE:Factory checked in at 2021-07-10 22:53:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-amqp (Old) and /work/SRC/openSUSE:Factory/.python-amqp.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-amqp" Sat Jul 10 22:53:33 2021 rev:37 rq:900656 version:5.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-amqp/python-amqp.changes 2021-02-04 20:23:49.666803752 +0100 +++ /work/SRC/openSUSE:Factory/.python-amqp.new.2625/python-amqp.changes 2021-07-10 22:53:34.864185233 +0200 @@ -1,0 +2,15 @@ +Thu Jun 17 20:47:28 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 5.0.6: + - Change the order in which context.check_hostname and context.verify_mode get set + in SSLTransport._wrap_socket_sni. Fixes bug introduced in 5.0.3 where setting + context.verify_mode = ssl.CERT_NONE would raise + "ValueError: Cannot set verify_mode to CERT_NONE when check_hostname is enabled." + Setting context.check_hostname prior to setting context.verify_mode resolves the + issue. + - Remove TCP_USER_TIMEOUT option for Solaris (#355) + - Pass long_description to setup() (#353) + - Fix for tox-docker 2.0 + - Moved to GitHub actions CI (#359) + +------------------------------------------------------------------- Old: ---- amqp-5.0.5.tar.gz New: ---- amqp-5.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-amqp.spec ++++++ --- /var/tmp/diff_new_pack.Xp2l2z/_old 2021-07-10 22:53:35.344181528 +0200 +++ /var/tmp/diff_new_pack.Xp2l2z/_new 2021-07-10 22:53:35.344181528 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-amqp -Version: 5.0.5 +Version: 5.0.6 Release: 0 Summary: Low-level AMQP client for Python (fork of amqplib) License: LGPL-2.1-or-later ++++++ amqp-5.0.5.tar.gz -> amqp-5.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/Changelog new/amqp-5.0.6/Changelog --- old/amqp-5.0.5/Changelog 2021-01-28 11:08:06.000000000 +0100 +++ new/amqp-5.0.6/Changelog 2021-04-01 06:40:10.000000000 +0200 @@ -5,6 +5,24 @@ The previous amqplib changelog is here: http://code.google.com/p/py-amqplib/source/browse/CHANGES +.. _version-5.0.6: + +5.0.6 +===== +:release-date: 2021-04-01 10:45 A.M. UTC+6:00 +:release-by: Asif Saif Uddin + +- Change the order in which context.check_hostname and context.verify_mode get set + in SSLTransport._wrap_socket_sni. Fixes bug introduced in 5.0.3 where setting + context.verify_mode = ssl.CERT_NONE would raise + "ValueError: Cannot set verify_mode to CERT_NONE when check_hostname is enabled." + Setting context.check_hostname prior to setting context.verify_mode resolves the + issue. +- Remove TCP_USER_TIMEOUT option for Solaris (#355) +- Pass long_description to setup() (#353) +- Fix for tox-docker 2.0 +- Moved to GitHub actions CI (#359) + .. _version-5.0.5: 5.0.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/PKG-INFO new/amqp-5.0.6/PKG-INFO --- old/amqp-5.0.5/PKG-INFO 2021-01-28 11:15:26.662340900 +0100 +++ new/amqp-5.0.6/PKG-INFO 2021-04-01 08:11:48.080170400 +0200 @@ -1,13 +1,223 @@ -Metadata-Version: 1.2 +Metadata-Version: 2.1 Name: amqp -Version: 5.0.5 +Version: 5.0.6 Summary: Low-level AMQP client for Python (fork of amqplib). Home-page: http://github.com/celery/py-amqp Author: Barry Pederson Author-email: [email protected] Maintainer: Asif Saif Uddin, Matus Valo License: BSD -Description: UNKNOWN +Description: ===================================================================== + Python AMQP 0.9.1 client library + ===================================================================== + + |build-status| |coverage| |license| |wheel| |pyversion| |pyimp| + + :Version: 5.0.6 + :Web: https://amqp.readthedocs.io/ + :Download: https://pypi.org/project/amqp/ + :Source: http://github.com/celery/py-amqp/ + :Keywords: amqp, rabbitmq + + About + ===== + + This is a fork of amqplib_ which was originally written by Barry Pederson. + It is maintained by the Celery_ project, and used by `kombu`_ as a pure python + alternative when `librabbitmq`_ is not available. + + This library should be API compatible with `librabbitmq`_. + + .. _amqplib: https://pypi.org/project/amqplib/ + .. _Celery: http://celeryproject.org/ + .. _kombu: https://kombu.readthedocs.io/ + .. _librabbitmq: https://pypi.org/project/librabbitmq/ + + Differences from `amqplib`_ + =========================== + + - Supports draining events from multiple channels (``Connection.drain_events``) + - Support for timeouts + - Channels are restored after channel error, instead of having to close the + connection. + - Support for heartbeats + + - ``Connection.heartbeat_tick(rate=2)`` must called at regular intervals + (half of the heartbeat value if rate is 2). + - Or some other scheme by using ``Connection.send_heartbeat``. + - Supports RabbitMQ extensions: + - Consumer Cancel Notifications + - by default a cancel results in ``ChannelError`` being raised + - but not if a ``on_cancel`` callback is passed to ``basic_consume``. + - Publisher confirms + - ``Channel.confirm_select()`` enables publisher confirms. + - ``Channel.events['basic_ack'].append(my_callback)`` adds a callback + to be called when a message is confirmed. This callback is then + called with the signature ``(delivery_tag, multiple)``. + - Exchange-to-exchange bindings: ``exchange_bind`` / ``exchange_unbind``. + - ``Channel.confirm_select()`` enables publisher confirms. + - ``Channel.events['basic_ack'].append(my_callback)`` adds a callback + to be called when a message is confirmed. This callback is then + called with the signature ``(delivery_tag, multiple)``. + - Authentication Failure Notifications + Instead of just closing the connection abruptly on invalid + credentials, py-amqp will raise an ``AccessRefused`` error + when connected to rabbitmq-server 3.2.0 or greater. + - Support for ``basic_return`` + - Uses AMQP 0-9-1 instead of 0-8. + - ``Channel.access_request`` and ``ticket`` arguments to methods + **removed**. + - Supports the ``arguments`` argument to ``basic_consume``. + - ``internal`` argument to ``exchange_declare`` removed. + - ``auto_delete`` argument to ``exchange_declare`` deprecated + - ``insist`` argument to ``Connection`` removed. + - ``Channel.alerts`` has been removed. + - Support for ``Channel.basic_recover_async``. + - ``Channel.basic_recover`` deprecated. + - Exceptions renamed to have idiomatic names: + - ``AMQPException`` -> ``AMQPError`` + - ``AMQPConnectionException`` -> ConnectionError`` + - ``AMQPChannelException`` -> ChannelError`` + - ``Connection.known_hosts`` removed. + - ``Connection`` no longer supports redirects. + - ``exchange`` argument to ``queue_bind`` can now be empty + to use the "default exchange". + - Adds ``Connection.is_alive`` that tries to detect + whether the connection can still be used. + - Adds ``Connection.connection_errors`` and ``.channel_errors``, + a list of recoverable errors. + - Exposes the underlying socket as ``Connection.sock``. + - Adds ``Channel.no_ack_consumers`` to keep track of consumer tags + that set the no_ack flag. + - Slightly better at error recovery + + Quick overview + ============== + + Simple producer publishing messages to ``test`` queue using default exchange: + + .. code:: python + + import amqp + + with amqp.Connection('broker.example.com') as c: + ch = c.channel() + ch.basic_publish(amqp.Message('Hello World'), routing_key='test') + + Producer publishing to ``test_exchange`` exchange with publisher confirms enabled and using virtual_host ``test_vhost``: + + .. code:: python + + import amqp + + with amqp.Connection( + 'broker.example.com', exchange='test_exchange', + confirm_publish=True, virtual_host='test_vhost' + ) as c: + ch = c.channel() + ch.basic_publish(amqp.Message('Hello World'), routing_key='test') + + Consumer with acknowledgments enabled: + + .. code:: python + + import amqp + + with amqp.Connection('broker.example.com') as c: + ch = c.channel() + def on_message(message): + print('Received message (delivery tag: {}): {}'.format(message.delivery_tag, message.body)) + ch.basic_ack(message.delivery_tag) + ch.basic_consume(queue='test', callback=on_message) + while True: + c.drain_events() + + + Consumer with acknowledgments disabled: + + .. code:: python + + import amqp + + with amqp.Connection('broker.example.com') as c: + ch = c.channel() + def on_message(message): + print('Received message (delivery tag: {}): {}'.format(message.delivery_tag, message.body)) + ch.basic_consume(queue='test', callback=on_message, no_ack=True) + while True: + c.drain_events() + + Speedups + ======== + + This library has **experimental** support of speedups. Speedups are implemented using Cython. To enable speedups, ``CELERY_ENABLE_SPEEDUPS`` environment variable must be set during building/installation. + Currently speedups can be installed: + + 1. using source package (using ``--no-binary`` switch): + + .. code:: shell + + CELERY_ENABLE_SPEEDUPS=true pip install --no-binary :all: amqp + + + 2. building directly source code: + + .. code:: shell + + CELERY_ENABLE_SPEEDUPS=true python setup.py install + + Further + ======= + + - Differences between AMQP 0.8 and 0.9.1 + + http://www.rabbitmq.com/amqp-0-8-to-0-9-1.html + + - AMQP 0.9.1 Quick Reference + + http://www.rabbitmq.com/amqp-0-9-1-quickref.html + + - RabbitMQ Extensions + + http://www.rabbitmq.com/extensions.html + + - For more information about AMQP, visit + + http://www.amqp.org + + - For other Python client libraries see: + + http://www.rabbitmq.com/devtools.html#python-dev + + .. |build-status| image:: https://api.travis-ci.com/celery/py-amqp.png?branch=master + :alt: Build status + :target: https://travis-ci.com/celery/py-amqp + + .. |coverage| image:: https://codecov.io/github/celery/py-amqp/coverage.svg?branch=master + :target: https://codecov.io/github/celery/py-amqp?branch=master + + .. |license| image:: https://img.shields.io/pypi/l/amqp.svg + :alt: BSD License + :target: https://opensource.org/licenses/BSD-3-Clause + + .. |wheel| image:: https://img.shields.io/pypi/wheel/amqp.svg + :alt: Python AMQP can be installed via wheel + :target: https://pypi.org/project/amqp/ + + .. |pyversion| image:: https://img.shields.io/pypi/pyversions/amqp.svg + :alt: Supported Python versions. + :target: https://pypi.org/project/amqp/ + + .. |pyimp| image:: https://img.shields.io/pypi/implementation/amqp.svg + :alt: Support Python implementations. + :target: https://pypi.org/project/amqp/ + + py-amqp as part of the Tidelift Subscription + ============================================ + + The maintainers of py-amqp and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/pypi-amqp?utm_source=pypi-amqp&utm_medium=referral&utm_campaign=readme&utm_term=repo) + + Keywords: amqp rabbitmq cloudamqp messaging Platform: any Classifier: Development Status :: 5 - Production/Stable @@ -23,3 +233,4 @@ Classifier: Intended Audience :: Developers Classifier: Operating System :: OS Independent Requires-Python: >=3.6 +Description-Content-Type: text/x-rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/README.rst new/amqp-5.0.6/README.rst --- old/amqp-5.0.5/README.rst 2021-01-28 11:09:02.000000000 +0100 +++ new/amqp-5.0.6/README.rst 2021-04-01 08:10:12.000000000 +0200 @@ -4,7 +4,7 @@ |build-status| |coverage| |license| |wheel| |pyversion| |pyimp| -:Version: 5.0.5 +:Version: 5.0.6 :Web: https://amqp.readthedocs.io/ :Download: https://pypi.org/project/amqp/ :Source: http://github.com/celery/py-amqp/ @@ -146,14 +146,16 @@ 1. using source package (using ``--no-binary`` switch): -.. code-block:: -CELERY_ENABLE_SPEEDUPS=true pip install --no-binary :all: amqp +.. code:: shell + + CELERY_ENABLE_SPEEDUPS=true pip install --no-binary :all: amqp 2. building directly source code: -.. code-block:: -CELERY_ENABLE_SPEEDUPS=true python setup.py install +.. code:: shell + + CELERY_ENABLE_SPEEDUPS=true python setup.py install Further ======= @@ -202,7 +204,7 @@ :target: https://pypi.org/project/amqp/ py-amqp as part of the Tidelift Subscription -======= +============================================ The maintainers of py-amqp and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/pypi-amqp?utm_source=pypi-amqp&utm_medium=referral&utm_campaign=readme&utm_term=repo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/amqp/__init__.py new/amqp-5.0.6/amqp/__init__.py --- old/amqp-5.0.5/amqp/__init__.py 2021-01-28 11:08:38.000000000 +0100 +++ new/amqp-5.0.6/amqp/__init__.py 2021-04-01 06:41:46.000000000 +0200 @@ -4,7 +4,7 @@ import re from collections import namedtuple -__version__ = '5.0.5' +__version__ = '5.0.6' __author__ = 'Barry Pederson' __maintainer__ = 'Asif Saif Uddin, Matus Valo' __contact__ = '[email protected]' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/amqp/channel.py new/amqp-5.0.6/amqp/channel.py --- old/amqp-5.0.5/amqp/channel.py 2020-12-13 06:35:15.000000000 +0100 +++ new/amqp-5.0.6/amqp/channel.py 2021-04-01 06:06:58.000000000 +0200 @@ -298,7 +298,7 @@ This method asks the peer to pause or restart the flow of content data. This is a simple flow-control mechanism that a - peer can use to avoid oveflowing its queues or otherwise + peer can use to avoid overflowing its queues or otherwise finding itself receiving more messages than it can process. Note that this method is not intended for window control. The peer that receives a request to stop sending content should @@ -322,7 +322,7 @@ A peer MAY use the Channel.Flow method to throttle incoming content data for internal reasons, for example, - when exchangeing data over a slower connection. + when exchanging data over a slower connection. RULE: @@ -347,7 +347,7 @@ This method asks the peer to pause or restart the flow of content data. This is a simple flow-control mechanism that a - peer can use to avoid oveflowing its queues or otherwise + peer can use to avoid overflowing its queues or otherwise finding itself receiving more messages than it can process. Note that this method is not intended for window control. The peer that receives a request to stop sending content should @@ -371,7 +371,7 @@ A peer MAY use the Channel.Flow method to throttle incoming content data for internal reasons, for example, - when exchangeing data over a slower connection. + when exchanging data over a slower connection. RULE: @@ -1398,7 +1398,7 @@ This method cancels a consumer. This does not affect already delivered messages, but it does mean the server will not send any more messages for that consumer. The client may receive - an abitrary number of messages in between sending the cancel + an arbitrary number of messages in between sending the cancel method and receiving the cancel-ok reply. RULE: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/amqp/platform.py new/amqp-5.0.6/amqp/platform.py --- old/amqp-5.0.5/amqp/platform.py 2020-12-13 06:35:15.000000000 +0100 +++ new/amqp-5.0.6/amqp/platform.py 2021-02-25 13:35:44.000000000 +0100 @@ -62,8 +62,10 @@ # illumos does not allow to set the TCP_MAXSEG socket option, # even if the Oracle documentation says otherwise. + # TCP_USER_TIMEOUT does not exist on Solaris 11.4 elif sys.platform.startswith('sunos'): KNOWN_TCP_OPTS.remove('TCP_MAXSEG') + KNOWN_TCP_OPTS.remove('TCP_USER_TIMEOUT') # aix does not allow to set the TCP_MAXSEG # or the TCP_USER_TIMEOUT socket options. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/amqp/transport.py new/amqp-5.0.6/amqp/transport.py --- old/amqp-5.0.5/amqp/transport.py 2021-01-28 09:19:05.000000000 +0100 +++ new/amqp-5.0.6/amqp/transport.py 2021-02-25 13:35:44.000000000 +0100 @@ -525,9 +525,13 @@ context.load_verify_locations(ca_certs) if ciphers is not None: context.set_ciphers(ciphers) - if cert_reqs is not None: - context.verify_mode = cert_reqs - # Set SNI headers if supported + # Set SNI headers if supported. + # Must set context.check_hostname before setting context.verify_mode + # to avoid setting context.verify_mode=ssl.CERT_NONE while + # context.check_hostname is still True (the default value in context + # if client-side) which results in the following exception: + # ValueError: Cannot set verify_mode to CERT_NONE when check_hostname + # is enabled. try: context.check_hostname = ( ssl.HAS_SNI and server_hostname is not None @@ -535,6 +539,11 @@ except AttributeError: pass # ask forgiveness not permission + # See note above re: ordering for context.check_hostname and + # context.verify_mode assignments. + if cert_reqs is not None: + context.verify_mode = cert_reqs + if ca_certs is None and context.verify_mode != ssl.CERT_NONE: purpose = ( ssl.Purpose.CLIENT_AUTH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/amqp.egg-info/PKG-INFO new/amqp-5.0.6/amqp.egg-info/PKG-INFO --- old/amqp-5.0.5/amqp.egg-info/PKG-INFO 2021-01-28 11:15:26.000000000 +0100 +++ new/amqp-5.0.6/amqp.egg-info/PKG-INFO 2021-04-01 08:11:47.000000000 +0200 @@ -1,13 +1,223 @@ -Metadata-Version: 1.2 +Metadata-Version: 2.1 Name: amqp -Version: 5.0.5 +Version: 5.0.6 Summary: Low-level AMQP client for Python (fork of amqplib). Home-page: http://github.com/celery/py-amqp Author: Barry Pederson Author-email: [email protected] Maintainer: Asif Saif Uddin, Matus Valo License: BSD -Description: UNKNOWN +Description: ===================================================================== + Python AMQP 0.9.1 client library + ===================================================================== + + |build-status| |coverage| |license| |wheel| |pyversion| |pyimp| + + :Version: 5.0.6 + :Web: https://amqp.readthedocs.io/ + :Download: https://pypi.org/project/amqp/ + :Source: http://github.com/celery/py-amqp/ + :Keywords: amqp, rabbitmq + + About + ===== + + This is a fork of amqplib_ which was originally written by Barry Pederson. + It is maintained by the Celery_ project, and used by `kombu`_ as a pure python + alternative when `librabbitmq`_ is not available. + + This library should be API compatible with `librabbitmq`_. + + .. _amqplib: https://pypi.org/project/amqplib/ + .. _Celery: http://celeryproject.org/ + .. _kombu: https://kombu.readthedocs.io/ + .. _librabbitmq: https://pypi.org/project/librabbitmq/ + + Differences from `amqplib`_ + =========================== + + - Supports draining events from multiple channels (``Connection.drain_events``) + - Support for timeouts + - Channels are restored after channel error, instead of having to close the + connection. + - Support for heartbeats + + - ``Connection.heartbeat_tick(rate=2)`` must called at regular intervals + (half of the heartbeat value if rate is 2). + - Or some other scheme by using ``Connection.send_heartbeat``. + - Supports RabbitMQ extensions: + - Consumer Cancel Notifications + - by default a cancel results in ``ChannelError`` being raised + - but not if a ``on_cancel`` callback is passed to ``basic_consume``. + - Publisher confirms + - ``Channel.confirm_select()`` enables publisher confirms. + - ``Channel.events['basic_ack'].append(my_callback)`` adds a callback + to be called when a message is confirmed. This callback is then + called with the signature ``(delivery_tag, multiple)``. + - Exchange-to-exchange bindings: ``exchange_bind`` / ``exchange_unbind``. + - ``Channel.confirm_select()`` enables publisher confirms. + - ``Channel.events['basic_ack'].append(my_callback)`` adds a callback + to be called when a message is confirmed. This callback is then + called with the signature ``(delivery_tag, multiple)``. + - Authentication Failure Notifications + Instead of just closing the connection abruptly on invalid + credentials, py-amqp will raise an ``AccessRefused`` error + when connected to rabbitmq-server 3.2.0 or greater. + - Support for ``basic_return`` + - Uses AMQP 0-9-1 instead of 0-8. + - ``Channel.access_request`` and ``ticket`` arguments to methods + **removed**. + - Supports the ``arguments`` argument to ``basic_consume``. + - ``internal`` argument to ``exchange_declare`` removed. + - ``auto_delete`` argument to ``exchange_declare`` deprecated + - ``insist`` argument to ``Connection`` removed. + - ``Channel.alerts`` has been removed. + - Support for ``Channel.basic_recover_async``. + - ``Channel.basic_recover`` deprecated. + - Exceptions renamed to have idiomatic names: + - ``AMQPException`` -> ``AMQPError`` + - ``AMQPConnectionException`` -> ConnectionError`` + - ``AMQPChannelException`` -> ChannelError`` + - ``Connection.known_hosts`` removed. + - ``Connection`` no longer supports redirects. + - ``exchange`` argument to ``queue_bind`` can now be empty + to use the "default exchange". + - Adds ``Connection.is_alive`` that tries to detect + whether the connection can still be used. + - Adds ``Connection.connection_errors`` and ``.channel_errors``, + a list of recoverable errors. + - Exposes the underlying socket as ``Connection.sock``. + - Adds ``Channel.no_ack_consumers`` to keep track of consumer tags + that set the no_ack flag. + - Slightly better at error recovery + + Quick overview + ============== + + Simple producer publishing messages to ``test`` queue using default exchange: + + .. code:: python + + import amqp + + with amqp.Connection('broker.example.com') as c: + ch = c.channel() + ch.basic_publish(amqp.Message('Hello World'), routing_key='test') + + Producer publishing to ``test_exchange`` exchange with publisher confirms enabled and using virtual_host ``test_vhost``: + + .. code:: python + + import amqp + + with amqp.Connection( + 'broker.example.com', exchange='test_exchange', + confirm_publish=True, virtual_host='test_vhost' + ) as c: + ch = c.channel() + ch.basic_publish(amqp.Message('Hello World'), routing_key='test') + + Consumer with acknowledgments enabled: + + .. code:: python + + import amqp + + with amqp.Connection('broker.example.com') as c: + ch = c.channel() + def on_message(message): + print('Received message (delivery tag: {}): {}'.format(message.delivery_tag, message.body)) + ch.basic_ack(message.delivery_tag) + ch.basic_consume(queue='test', callback=on_message) + while True: + c.drain_events() + + + Consumer with acknowledgments disabled: + + .. code:: python + + import amqp + + with amqp.Connection('broker.example.com') as c: + ch = c.channel() + def on_message(message): + print('Received message (delivery tag: {}): {}'.format(message.delivery_tag, message.body)) + ch.basic_consume(queue='test', callback=on_message, no_ack=True) + while True: + c.drain_events() + + Speedups + ======== + + This library has **experimental** support of speedups. Speedups are implemented using Cython. To enable speedups, ``CELERY_ENABLE_SPEEDUPS`` environment variable must be set during building/installation. + Currently speedups can be installed: + + 1. using source package (using ``--no-binary`` switch): + + .. code:: shell + + CELERY_ENABLE_SPEEDUPS=true pip install --no-binary :all: amqp + + + 2. building directly source code: + + .. code:: shell + + CELERY_ENABLE_SPEEDUPS=true python setup.py install + + Further + ======= + + - Differences between AMQP 0.8 and 0.9.1 + + http://www.rabbitmq.com/amqp-0-8-to-0-9-1.html + + - AMQP 0.9.1 Quick Reference + + http://www.rabbitmq.com/amqp-0-9-1-quickref.html + + - RabbitMQ Extensions + + http://www.rabbitmq.com/extensions.html + + - For more information about AMQP, visit + + http://www.amqp.org + + - For other Python client libraries see: + + http://www.rabbitmq.com/devtools.html#python-dev + + .. |build-status| image:: https://api.travis-ci.com/celery/py-amqp.png?branch=master + :alt: Build status + :target: https://travis-ci.com/celery/py-amqp + + .. |coverage| image:: https://codecov.io/github/celery/py-amqp/coverage.svg?branch=master + :target: https://codecov.io/github/celery/py-amqp?branch=master + + .. |license| image:: https://img.shields.io/pypi/l/amqp.svg + :alt: BSD License + :target: https://opensource.org/licenses/BSD-3-Clause + + .. |wheel| image:: https://img.shields.io/pypi/wheel/amqp.svg + :alt: Python AMQP can be installed via wheel + :target: https://pypi.org/project/amqp/ + + .. |pyversion| image:: https://img.shields.io/pypi/pyversions/amqp.svg + :alt: Supported Python versions. + :target: https://pypi.org/project/amqp/ + + .. |pyimp| image:: https://img.shields.io/pypi/implementation/amqp.svg + :alt: Support Python implementations. + :target: https://pypi.org/project/amqp/ + + py-amqp as part of the Tidelift Subscription + ============================================ + + The maintainers of py-amqp and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/pypi-amqp?utm_source=pypi-amqp&utm_medium=referral&utm_campaign=readme&utm_term=repo) + + Keywords: amqp rabbitmq cloudamqp messaging Platform: any Classifier: Development Status :: 5 - Production/Stable @@ -23,3 +233,4 @@ Classifier: Intended Audience :: Developers Classifier: Operating System :: OS Independent Requires-Python: >=3.6 +Description-Content-Type: text/x-rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/docs/includes/introduction.txt new/amqp-5.0.6/docs/includes/introduction.txt --- old/amqp-5.0.5/docs/includes/introduction.txt 2021-01-28 11:08:49.000000000 +0100 +++ new/amqp-5.0.6/docs/includes/introduction.txt 2021-04-01 06:42:21.000000000 +0200 @@ -1,4 +1,4 @@ -:Version: 5.0.5 +:Version: 5.0.6 :Web: https://amqp.readthedocs.io/ :Download: https://pypi.org/project/amqp/ :Source: http://github.com/celery/py-amqp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/setup.py new/amqp-5.0.6/setup.py --- old/amqp-5.0.5/setup.py 2020-12-13 06:35:15.000000000 +0100 +++ new/amqp-5.0.6/setup.py 2021-04-01 08:02:15.000000000 +0200 @@ -1,9 +1,9 @@ #!/usr/bin/env python -import codecs -import os import re import sys +from os import environ +from pathlib import Path import setuptools import setuptools.command.test @@ -45,16 +45,15 @@ pats = {re_meta: add_default, re_doc: add_doc} -here = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(here, 'amqp/__init__.py')) as meta_fh: - meta = {} - for line in meta_fh: - if line.strip() == '# -eof meta-': - break - for pattern, handler in pats.items(): - m = pattern.match(line.strip()) - if m: - meta.update(handler(m)) +here = Path(__file__).parent +meta = {} +for line in (here / 'amqp/__init__.py').read_text().splitlines(): + if line.strip() == '# -eof meta-': + break + for pattern, handler in pats.items(): + m = pattern.match(line.strip()) + if m: + meta.update(handler(m)) # -*- Installation Requires -*- @@ -68,20 +67,9 @@ def reqs(f): - with open(os.path.join(os.getcwd(), 'requirements', f)) as fp: - req = filter(None, [strip_comments(l) for l in fp.readlines()]) - # filter returns filter object(iterator) in Python 3, - # but a list in Python 2.7, so make sure it returns a list. - return list(req) - - -# -*- Long Description -*- - -def long_description(): - try: - return codecs.open('README.rst', 'r', 'utf-8').read() - except OSError: - return 'Long description error: Missing README.rst file' + lines = (here / 'requirements' / f).read_text().splitlines() + reqs = [strip_comments(l) for l in lines] + return list(filter(None, reqs)) # -*- %%% -*- @@ -100,7 +88,7 @@ sys.exit(pytest.main(pytest_args)) -if os.environ.get("CELERY_ENABLE_SPEEDUPS"): +if environ.get("CELERY_ENABLE_SPEEDUPS"): setup_requires = ['Cython'] ext_modules = [ setuptools.Extension( @@ -133,6 +121,8 @@ packages=setuptools.find_packages(exclude=['ez_setup', 't', 't.*']), version=meta['version'], description=meta['doc'], + long_description=(here / 'README.rst').read_text(), + long_description_content_type="text/x-rst", keywords='amqp rabbitmq cloudamqp messaging', author=meta['author'], author_email=meta['contact'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amqp-5.0.5/t/unit/test_transport.py new/amqp-5.0.6/t/unit/test_transport.py --- old/amqp-5.0.5/t/unit/test_transport.py 2021-01-28 09:19:05.000000000 +0100 +++ new/amqp-5.0.6/t/unit/test_transport.py 2021-02-25 13:35:44.000000000 +0100 @@ -700,7 +700,6 @@ set_ciphers_method_mock.assert_called_with(sentinel.CIPHERS) def test_wrap_socket_sni_cert_reqs(self): - # testing _wrap_socket_sni() with parameter cert_reqs == ssl.CERT_NONE with patch('ssl.SSLContext') as mock_ssl_context_class: sock = Mock() context = mock_ssl_context_class() @@ -720,6 +719,48 @@ ) assert context.verify_mode == sentinel.CERT_REQS + # testing context creation inside _wrap_socket_sni() with parameter + # cert_reqs == ssl.CERT_NONE. Previously raised ValueError because + # code path attempted to set context.verify_mode=ssl.CERT_NONE before + # setting context.check_hostname = False which raised a ValueError + with patch('ssl.SSLContext.wrap_socket') as mock_wrap_socket: + with patch('ssl.SSLContext.load_default_certs') as mock_load_default_certs: + sock = Mock() + self.t._wrap_socket_sni( + sock, server_side=True, cert_reqs=ssl.CERT_NONE + ) + mock_load_default_certs.assert_not_called() + mock_wrap_socket.assert_called_once() + + with patch('ssl.SSLContext.wrap_socket') as mock_wrap_socket: + with patch('ssl.SSLContext.load_default_certs') as mock_load_default_certs: + sock = Mock() + self.t._wrap_socket_sni( + sock, server_side=False, cert_reqs=ssl.CERT_NONE + ) + mock_load_default_certs.assert_not_called() + mock_wrap_socket.assert_called_once() + + with patch('ssl.SSLContext.wrap_socket') as mock_wrap_socket: + with patch('ssl.SSLContext.load_default_certs') as mock_load_default_certs: + sock = Mock() + self.t._wrap_socket_sni( + sock, server_side=True, cert_reqs=ssl.CERT_REQUIRED + ) + mock_load_default_certs.assert_called_with(ssl.Purpose.CLIENT_AUTH) + mock_wrap_socket.assert_called_once() + + with patch('ssl.SSLContext.wrap_socket') as mock_wrap_socket: + with patch('ssl.SSLContext.load_default_certs') as mock_load_default_certs: + sock = Mock() + self.t._wrap_socket_sni( + sock, server_side=False, cert_reqs=ssl.CERT_REQUIRED + ) + mock_load_default_certs.assert_called_once_with( + ssl.Purpose.SERVER_AUTH + ) + mock_wrap_socket.assert_called_once() + def test_wrap_socket_sni_setting_sni_header(self): # testing _wrap_socket_sni() without parameter server_hostname
