Hello community,
here is the log from the commit of package python-stomp.py for openSUSE:Factory
checked in at 2020-01-25 13:25:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-stomp.py (Old)
and /work/SRC/openSUSE:Factory/.python-stomp.py.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-stomp.py"
Sat Jan 25 13:25:35 2020 rev:6 rq:767035 version:5.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-stomp.py/python-stomp.py.changes
2020-01-06 15:24:37.772556707 +0100
+++
/work/SRC/openSUSE:Factory/.python-stomp.py.new.26092/python-stomp.py.changes
2020-01-25 13:25:44.140077982 +0100
@@ -1,0 +2,6 @@
+Sat Jan 18 10:56:54 UTC 2020 - Sebastian Wagner <[email protected]>
+
+- update to version 5.0.1:
+ * Fix logging simplification code (should not be logging to root appender -
https://github.com/jasonrbriggs/stomp.py/issues/275)
+
+-------------------------------------------------------------------
Old:
----
stomp.py-5.0.0.tar.gz
New:
----
stomp.py-5.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-stomp.py.spec ++++++
--- /var/tmp/diff_new_pack.kEFSUe/_old 2020-01-25 13:25:45.056078383 +0100
+++ /var/tmp/diff_new_pack.kEFSUe/_new 2020-01-25 13:25:45.056078383 +0100
@@ -18,7 +18,7 @@
%define skip_python2 1
Name: python-stomp.py
-Version: 5.0.0
+Version: 5.0.1
Release: 0
Summary: Python STOMP client
License: Apache-2.0
++++++ stomp.py-5.0.0.tar.gz -> stomp.py-5.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/CHANGELOG new/stomp.py-5.0.1/CHANGELOG
--- old/stomp.py-5.0.0/CHANGELOG 2020-01-03 23:42:46.000000000 +0100
+++ new/stomp.py-5.0.1/CHANGELOG 2020-01-07 23:40:41.000000000 +0100
@@ -1,3 +1,8 @@
+Version 5.0.1 - Jan 2020
+
+ * Fix logging simplification code (should not be logging to root appender -
https://github.com/jasonrbriggs/stomp.py/issues/275)
+
+
Version 5.0.0 - Jan 2020
* Fix for credentials exposure
(https://github.com/jasonrbriggs/stomp.py/pull/244)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/PKG-INFO new/stomp.py-5.0.1/PKG-INFO
--- old/stomp.py-5.0.0/PKG-INFO 2020-01-04 00:31:13.022460700 +0100
+++ new/stomp.py-5.0.1/PKG-INFO 2020-01-08 19:39:46.085053700 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: stomp.py
-Version: 5.0.0
+Version: 5.0.1
Summary: Python STOMP client, supporting versions 1.0, 1.1 and 1.2 of the
protocol
Home-page: https://github.com/jasonrbriggs/stomp.py
Author: Jason R Briggs
@@ -11,82 +11,66 @@
========
.. image:: https://badge.fury.io/py/stomp.py.svg
- :target: https://badge.fury.io/py/stomp.py
- :alt: PyPI version
+ :target: https://badge.fury.io/py/stomp.py
+ :alt: PyPI version
.. image:: https://travis-ci.org/jasonrbriggs/stomp.py.svg
- :target: https://travis-ci.org/jasonrbriggs/stomp.py
- :alt: Build Status
+ :target: https://travis-ci.org/jasonrbriggs/stomp.py
+ :alt: Build Status
- "stomp.py" is a Python client library for accessing messaging servers
(such as ActiveMQ_, Apollo_ or RabbitMQ_) using the STOMP_ protocol (`STOMP
v1.0`_, `STOMP v1.1`_ and `STOMP v1.2`_). It can also be run as a standalone,
command-line client for testing.
+ "stomp.py" is a Python client library for accessing messaging servers
(such as ActiveMQ_, Artemis_ or RabbitMQ_) using the STOMP_ protocol (`STOMP
v1.0`_, `STOMP v1.1`_ and `STOMP v1.2`_). It can also be run as a standalone,
command-line client for testing.
**NOTE:** Stomp.py has officially ended support for Python2.x. See
`python3statement.org`_ for more information.
- .. _STOMP: http://stomp.github.io
- .. _`STOMP v1.0`: http://stomp.github.io/stomp-specification-1.0.html
- .. _`STOMP v1.1`: http://stomp.github.io/stomp-specification-1.1.html
- .. _`STOMP v1.2`: http://stomp.github.io/stomp-specification-1.2.html
- .. _`python3statement.org`: http://python3statement.org/
+ .. contents:: \
+ :depth: 1
+
Quick Start
===========
You can connect to a message broker running on the local machine, and
send a message using the following example.
- .. code:: python
+ .. code-block:: python
import stomp
conn = stomp.Connection()
- conn.set_listener('', MyListener())
conn.connect('admin', 'password', wait=True)
conn.send(body=' '.join(sys.argv[1:]), destination='/queue/test')
conn.disconnect()
- Documentation and resources include:
- - a basic example of using stomp.py with a message listener (see the
`quick start`_)
- - `command-line interface description`_
- - installation instructions and downloads on `PyPi stomp.py page`_
- - `API documentation`_
- - current `test coverage report`_
- - `travis`_ for continuous integration builds
+ Documentation and Resources
+ ===========================
- .. _`quick start`:
http://jasonrbriggs.github.io/stomp.py/quickstart.html
- .. _`command-line interface description`:
http://jasonrbriggs.github.io/stomp.py/commandline.html
- .. _`PyPi stomp.py page`: https://pypi.org/project/stomp.py/
- .. _`API documentation`:
http://jasonrbriggs.github.io/stomp.py/api.html
- .. _`test coverage report`:
http://jasonrbriggs.github.io/stomp.py/htmlcov/
- .. _`travis`: https://travis-ci.org/jasonrbriggs/stomp.py
+ - `Main documentation`_
+ - `API documentation`_ (see `stomp.github.io`_ for details on the
STOMP protocol itself)
+ - A basic example of using stomp.py with a message listener can be
found in the `quick start`_ section of the main documentation
+ - Description of the `command-line interface`_
+ - `Travis`_ for continuous integration builds
+ - Current `test coverage report`_
+ - `PyPi stomp.py page`_
-
- Current version supports:
+ The current version of stomp.py supports:
- Python 3.x (Python2 support ended as of Jan 2020)
- STOMP version 1.0, 1.1 and 1.2
- There is also legacy 3.1.7 version using the old 3-series code (see
`3.1.7 on PyPi`_ and `3.1.7 on GitHub`_).
-
- .. _`3.1.7 on PyPi`: https://pypi.org/project/stomp.py/3.1.7/
- .. _`3.1.7 on GitHub`:
https://github.com/jasonrbriggs/stomp.py/tree/stomppy-3series
-
- stomp.py has been perfunctorily tested on:
+ There is also legacy 3.1.7 version using the old 3-series code (see
`3.1.7 on PyPi`_ and `3.1.7 on GitHub`_). This is no longer supported, but (at
least as of 2018) there were still a couple of reports of this version still
being used in the wild.
- - ActiveMQ_
- - Apollo_
- - RabbitMQ_
- - stompserver_
- .. _ActiveMQ: http://activemq.apache.org/
- .. _Apollo: http://activemq.apache.org/apollo/
- .. _RabbitMQ: http://www.rabbitmq.com
- .. _stompserver: http://stompserver.rubyforge.org
+ Testing
+ =======
- `stomp.py` has been reported to work with JBossMessaging_ in the
distant past (note: no idea whether the same is true of the replacement,
HornetQ)
+ stomp.py has been perfunctorily tested on:
- .. _JBossMessaging: http://www.jboss.org/jbossmessaging
+ - Pivotal `RabbitMQ`_ (`rabbitmq_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/rabbitmq_test.py>`_)
+ - Apache `ActiveMQ`_ (`activemq_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/activemq_test.py>`_)
+ - Apache ActiveMQ `Artemis`_ (`artemis_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/artemis_test.py>`_)
+ - `stompserver`_ (`stompserver_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/stompserver_test.py>`_)
- For testing locally, you'll need docker:
+ For testing locally, you'll need to install docker. Once installed:
#. Create the docker image:
make docker-image
@@ -98,6 +82,37 @@
make remove-docker
+ Donate
+ ======
+
+ If you find this project useful, why not `buy me a coffee`_.
+
+
+ .. _`STOMP`: http://stomp.github.io
+ .. _`STOMP v1.0`: http://stomp.github.io/stomp-specification-1.0.html
+ .. _`STOMP v1.1`: http://stomp.github.io/stomp-specification-1.1.html
+ .. _`STOMP v1.2`: http://stomp.github.io/stomp-specification-1.2.html
+ .. _`python3statement.org`: http://python3statement.org/
+
+ .. _`Main documentation`:
http://jasonrbriggs.github.io/stomp.py/index.html
+ .. _`stomp.github.io`: http://stomp.github.io/
+ .. _`quick start`:
http://jasonrbriggs.github.io/stomp.py/quickstart.html
+ .. _`command-line interface`:
http://jasonrbriggs.github.io/stomp.py/commandline.html
+ .. _`PyPi stomp.py page`: https://pypi.org/project/stomp.py/
+ .. _`API documentation`:
http://jasonrbriggs.github.io/stomp.py/api.html
+ .. _`test coverage report`:
http://jasonrbriggs.github.io/stomp.py/htmlcov/
+ .. _`Travis`: https://travis-ci.org/jasonrbriggs/stomp.py
+
+ .. _`3.1.7 on PyPi`: https://pypi.org/project/stomp.py/3.1.7/
+ .. _`3.1.7 on GitHub`:
https://github.com/jasonrbriggs/stomp.py/tree/stomppy-3series
+
+ .. _`ActiveMQ`: http://activemq.apache.org/
+ .. _`Artemis`: https://activemq.apache.org/components/artemis/
+ .. _`RabbitMQ`: http://www.rabbitmq.com
+ .. _`stompserver`: http://stompserver.rubyforge.org
+
+ .. _`buy me a coffee`: https://www.paypal.me/jasonrbriggs
+
Platform: any
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/README new/stomp.py-5.0.1/README
--- old/stomp.py-5.0.0/README 2019-12-30 18:13:19.000000000 +0100
+++ new/stomp.py-5.0.1/README 2020-01-05 11:31:43.000000000 +0100
@@ -1,4 +1,4 @@
-"stomp.py" is a Python client library for accessing messaging servers (such as
ActiveMQ, Apollo or RabbitMQ) using the `STOMP protocol
<http://stomp.github.io>`_ (versions `1.0
<http://stomp.github.io/stomp-specification-1.0.html>`_, `1.1
<http://stomp.github.io/stomp-specification-1.1.html>`_ and `1.2
<http://stomp.github.io/stomp-specification-1.2.html>`_). It can also be run as
a standalone, command-line client for testing.
+"stomp.py" is a Python client library for accessing messaging servers (such as
ActiveMQ, Artemis or RabbitMQ) using the `STOMP protocol
<http://stomp.github.io>`_ (versions `1.0
<http://stomp.github.io/stomp-specification-1.0.html>`_, `1.1
<http://stomp.github.io/stomp-specification-1.1.html>`_ and `1.2
<http://stomp.github.io/stomp-specification-1.2.html>`_). It can also be run as
a standalone, command-line client for testing.
A basic example of using stomp.py can be found `here
<https://github.com/jasonrbriggs/stomp.py/wiki/Simple-Example>`_.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/README.rst
new/stomp.py-5.0.1/README.rst
--- old/stomp.py-5.0.0/README.rst 2019-12-30 20:29:34.000000000 +0100
+++ new/stomp.py-5.0.1/README.rst 2020-01-08 19:38:59.000000000 +0100
@@ -3,82 +3,66 @@
========
.. image:: https://badge.fury.io/py/stomp.py.svg
- :target: https://badge.fury.io/py/stomp.py
- :alt: PyPI version
+ :target: https://badge.fury.io/py/stomp.py
+ :alt: PyPI version
.. image:: https://travis-ci.org/jasonrbriggs/stomp.py.svg
- :target: https://travis-ci.org/jasonrbriggs/stomp.py
- :alt: Build Status
+ :target: https://travis-ci.org/jasonrbriggs/stomp.py
+ :alt: Build Status
-"stomp.py" is a Python client library for accessing messaging servers (such as
ActiveMQ_, Apollo_ or RabbitMQ_) using the STOMP_ protocol (`STOMP v1.0`_,
`STOMP v1.1`_ and `STOMP v1.2`_). It can also be run as a standalone,
command-line client for testing.
+"stomp.py" is a Python client library for accessing messaging servers (such as
ActiveMQ_, Artemis_ or RabbitMQ_) using the STOMP_ protocol (`STOMP v1.0`_,
`STOMP v1.1`_ and `STOMP v1.2`_). It can also be run as a standalone,
command-line client for testing.
**NOTE:** Stomp.py has officially ended support for Python2.x. See
`python3statement.org`_ for more information.
-.. _STOMP: http://stomp.github.io
-.. _`STOMP v1.0`: http://stomp.github.io/stomp-specification-1.0.html
-.. _`STOMP v1.1`: http://stomp.github.io/stomp-specification-1.1.html
-.. _`STOMP v1.2`: http://stomp.github.io/stomp-specification-1.2.html
-.. _`python3statement.org`: http://python3statement.org/
+.. contents:: \
+ :depth: 1
+
Quick Start
===========
You can connect to a message broker running on the local machine, and send a
message using the following example.
-.. code:: python
+.. code-block:: python
import stomp
conn = stomp.Connection()
- conn.set_listener('', MyListener())
conn.connect('admin', 'password', wait=True)
conn.send(body=' '.join(sys.argv[1:]), destination='/queue/test')
conn.disconnect()
-Documentation and resources include:
-- a basic example of using stomp.py with a message listener (see the `quick
start`_)
-- `command-line interface description`_
-- installation instructions and downloads on `PyPi stomp.py page`_
-- `API documentation`_
-- current `test coverage report`_
-- `travis`_ for continuous integration builds
+Documentation and Resources
+===========================
-.. _`quick start`: http://jasonrbriggs.github.io/stomp.py/quickstart.html
-.. _`command-line interface description`:
http://jasonrbriggs.github.io/stomp.py/commandline.html
-.. _`PyPi stomp.py page`: https://pypi.org/project/stomp.py/
-.. _`API documentation`: http://jasonrbriggs.github.io/stomp.py/api.html
-.. _`test coverage report`: http://jasonrbriggs.github.io/stomp.py/htmlcov/
-.. _`travis`: https://travis-ci.org/jasonrbriggs/stomp.py
+- `Main documentation`_
+- `API documentation`_ (see `stomp.github.io`_ for details on the STOMP
protocol itself)
+- A basic example of using stomp.py with a message listener can be found in
the `quick start`_ section of the main documentation
+- Description of the `command-line interface`_
+- `Travis`_ for continuous integration builds
+- Current `test coverage report`_
+- `PyPi stomp.py page`_
-
-Current version supports:
+The current version of stomp.py supports:
- Python 3.x (Python2 support ended as of Jan 2020)
- STOMP version 1.0, 1.1 and 1.2
-There is also legacy 3.1.7 version using the old 3-series code (see `3.1.7 on
PyPi`_ and `3.1.7 on GitHub`_).
-
-.. _`3.1.7 on PyPi`: https://pypi.org/project/stomp.py/3.1.7/
-.. _`3.1.7 on GitHub`:
https://github.com/jasonrbriggs/stomp.py/tree/stomppy-3series
-
-stomp.py has been perfunctorily tested on:
+There is also legacy 3.1.7 version using the old 3-series code (see `3.1.7 on
PyPi`_ and `3.1.7 on GitHub`_). This is no longer supported, but (at least as
of 2018) there were still a couple of reports of this version still being used
in the wild.
-- ActiveMQ_
-- Apollo_
-- RabbitMQ_
-- stompserver_
-.. _ActiveMQ: http://activemq.apache.org/
-.. _Apollo: http://activemq.apache.org/apollo/
-.. _RabbitMQ: http://www.rabbitmq.com
-.. _stompserver: http://stompserver.rubyforge.org
+Testing
+=======
-`stomp.py` has been reported to work with JBossMessaging_ in the distant past
(note: no idea whether the same is true of the replacement, HornetQ)
+stomp.py has been perfunctorily tested on:
-.. _JBossMessaging: http://www.jboss.org/jbossmessaging
+- Pivotal `RabbitMQ`_ (`rabbitmq_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/rabbitmq_test.py>`_)
+- Apache `ActiveMQ`_ (`activemq_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/activemq_test.py>`_)
+- Apache ActiveMQ `Artemis`_ (`artemis_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/artemis_test.py>`_)
+- `stompserver`_ (`stompserver_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/stompserver_test.py>`_)
-For testing locally, you'll need docker:
+For testing locally, you'll need to install docker. Once installed:
#. Create the docker image:
make docker-image
@@ -89,3 +73,34 @@
#. Cleanup the container afterwards if you don't need it any more:
make remove-docker
+
+Donate
+======
+
+If you find this project useful, why not `buy me a coffee`_.
+
+
+.. _`STOMP`: http://stomp.github.io
+.. _`STOMP v1.0`: http://stomp.github.io/stomp-specification-1.0.html
+.. _`STOMP v1.1`: http://stomp.github.io/stomp-specification-1.1.html
+.. _`STOMP v1.2`: http://stomp.github.io/stomp-specification-1.2.html
+.. _`python3statement.org`: http://python3statement.org/
+
+.. _`Main documentation`: http://jasonrbriggs.github.io/stomp.py/index.html
+.. _`stomp.github.io`: http://stomp.github.io/
+.. _`quick start`: http://jasonrbriggs.github.io/stomp.py/quickstart.html
+.. _`command-line interface`:
http://jasonrbriggs.github.io/stomp.py/commandline.html
+.. _`PyPi stomp.py page`: https://pypi.org/project/stomp.py/
+.. _`API documentation`: http://jasonrbriggs.github.io/stomp.py/api.html
+.. _`test coverage report`: http://jasonrbriggs.github.io/stomp.py/htmlcov/
+.. _`Travis`: https://travis-ci.org/jasonrbriggs/stomp.py
+
+.. _`3.1.7 on PyPi`: https://pypi.org/project/stomp.py/3.1.7/
+.. _`3.1.7 on GitHub`:
https://github.com/jasonrbriggs/stomp.py/tree/stomppy-3series
+
+.. _`ActiveMQ`: http://activemq.apache.org/
+.. _`Artemis`: https://activemq.apache.org/components/artemis/
+.. _`RabbitMQ`: http://www.rabbitmq.com
+.. _`stompserver`: http://stompserver.rubyforge.org
+
+.. _`buy me a coffee`: https://www.paypal.me/jasonrbriggs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/setup.py new/stomp.py-5.0.1/setup.py
--- old/stomp.py-5.0.0/setup.py 2019-12-30 18:13:19.000000000 +0100
+++ new/stomp.py-5.0.1/setup.py 2020-01-07 20:42:07.000000000 +0100
@@ -5,7 +5,6 @@
import glob
import platform
import io
-import logging
from logging import config
import os
import shutil
@@ -15,6 +14,8 @@
config.fileConfig('stomp.log.conf')
+from stomp import logging
+
with io.open('README.rst', 'rt', encoding='utf8') as f:
long_description = f.read()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/__init__.py
new/stomp.py-5.0.1/stomp/__init__.py
--- old/stomp.py-5.0.0/stomp/__init__.py 2020-01-03 23:43:02.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/__init__.py 2020-01-08 19:11:42.000000000
+0100
@@ -9,13 +9,12 @@
"""
-import logging
-
import stomp.adapter as adapter
import stomp.connect as connect
import stomp.listener as listener
+import stomp.logging as logging
-__version__ = (5, 0, 0)
+__version__ = (5, 0, 1)
##
# Alias for STOMP 1.0 connections.
@@ -57,6 +56,3 @@
##
# Access to the printing listener
PrintingListener = listener.PrintingListener
-
-__log = logging.getLogger('stomp.py')
-logging.isEnabledFor = __log.isEnabledFor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/listener.py
new/stomp.py-5.0.1/stomp/listener.py
--- old/stomp.py-5.0.0/stomp/listener.py 2019-12-30 18:13:19.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/listener.py 2020-01-07 20:41:11.000000000
+0100
@@ -1,7 +1,6 @@
"""Various listeners for using with stomp.py connections.
"""
-import logging
import os
import sys
import threading
@@ -11,6 +10,7 @@
import stomp.exception as exception
import stomp.utils as utils
from stomp.constants import *
+from stomp import logging
class Publisher(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/logging.py
new/stomp.py-5.0.1/stomp/logging.py
--- old/stomp.py-5.0.0/stomp/logging.py 1970-01-01 01:00:00.000000000 +0100
+++ new/stomp.py-5.0.1/stomp/logging.py 2020-01-07 23:47:44.000000000 +0100
@@ -0,0 +1,12 @@
+import logging
+
+DEBUG = logging.DEBUG
+INFO = logging.INFO
+
+__logger = logging.getLogger('stomp.py')
+debug = __logger.debug
+info = __logger.info
+warning = __logger.warning
+error = __logger.error
+isEnabledFor = __logger.isEnabledFor
+setLevel = __logger.setLevel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/protocol.py
new/stomp.py-5.0.1/stomp/protocol.py
--- old/stomp.py-5.0.0/stomp/protocol.py 2019-12-30 18:13:19.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/protocol.py 2020-01-07 20:36:55.000000000
+0100
@@ -52,6 +52,7 @@
:param str id: identifier of the message
:param str transaction: include the acknowledgement in the specified
transaction
+ :param str receipt: the receipt id
"""
assert id is not None, "'id' is required"
headers = {HDR_MESSAGE_ID: id}
@@ -263,6 +264,7 @@
:param str id: identifier of the message
:param str subscription: the subscription this message is associated
with
:param str transaction: include the acknowledgement in the specified
transaction
+ :param str receipt: the receipt id
"""
assert id is not None, "'id' is required"
assert subscription is not None, "'subscription' is required"
@@ -361,6 +363,7 @@
:param str id: the unique id of the message to nack
:param str subscription: the subscription this message is associated
with
:param str transaction: include this nack in a named transaction
+ :param str receipt: the receipt id
:param keyword_headers: any additional headers to send with the nack
command
"""
assert id is not None, "'id' is required"
@@ -457,6 +460,7 @@
:param str id: identifier of the message
:param str transaction: include the acknowledgement in the specified
transaction
+ :param str receipt: the receipt id
"""
assert id is not None, "'id' is required"
headers = {HDR_ID: id}
@@ -472,6 +476,7 @@
:param str id: the unique id of the message to nack
:param str transaction: include this nack in a named transaction
+ :param str receipt: the receipt id
:param keyword_headers: any additional headers to send with the nack
command
"""
assert id is not None, "'id' is required"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/test/__init__.py
new/stomp.py-5.0.1/stomp/test/__init__.py
--- old/stomp.py-5.0.0/stomp/test/__init__.py 2019-12-30 18:13:19.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/test/__init__.py 2020-01-05 11:31:43.000000000
+0100
@@ -1,4 +1,4 @@
__all__ = ['basic_test', 'nonascii_test', 'ss_test', 'cli_test',
'cli_ssl_test', 's10_test',
's11_test', 's12_test', 'activemq_test', 'rabbitmq_test',
'stompserver_test',
'misc_test', 'multicast_test', 'ssl_test', 'utils_test',
- 'transport_test', 'local_test']
+ 'transport_test', 'local_test', 'artemis_test']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/test/apollo_test.py
new/stomp.py-5.0.1/stomp/test/apollo_test.py
--- old/stomp.py-5.0.0/stomp/test/apollo_test.py 2019-10-22
20:05:26.000000000 +0200
+++ new/stomp.py-5.0.1/stomp/test/apollo_test.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-import unittest
-
-import stomp
-from stomp.listener import WaitingListener
-from stomp.test.testutils import *
-
-
-class TestApolloSend(unittest.TestCase):
-
- def setUp(self):
- pass
-
- def testbasic(self):
- conn = stomp.Connection11(get_apollo_host())
- listener = WaitingListener('123')
- conn.set_listener('', listener)
- conn.connect(get_default_user(), get_default_password(), wait=True)
- conn.subscribe(destination='/queue/test', id=1, ack='auto')
-
- conn.send(body='this is a test', destination='/queue/test',
receipt='123')
-
- listener.wait_on_receipt()
-
- conn.disconnect(receipt=None)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/test/artemis_test.py
new/stomp.py-5.0.1/stomp/test/artemis_test.py
--- old/stomp.py-5.0.0/stomp/test/artemis_test.py 1970-01-01
01:00:00.000000000 +0100
+++ new/stomp.py-5.0.1/stomp/test/artemis_test.py 2020-01-05
11:31:43.000000000 +0100
@@ -0,0 +1,24 @@
+import unittest
+
+import stomp
+from stomp.listener import WaitingListener
+from stomp.test.testutils import *
+
+
+class TestArtemisSend(unittest.TestCase):
+
+ def setUp(self):
+ pass
+
+ def testbasic(self):
+ conn = stomp.Connection11(get_artemis_host())
+ listener = WaitingListener('123')
+ conn.set_listener('', listener)
+ conn.connect(get_artemis_user(), get_artemis_password(), wait=True)
+ conn.subscribe(destination='/queue/test', id=1, ack='auto')
+
+ conn.send(body='this is a test', destination='/queue/test',
receipt='123')
+
+ listener.wait_on_receipt()
+
+ conn.disconnect(receipt=None)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/test/setup.ini
new/stomp.py-5.0.1/stomp/test/setup.ini
--- old/stomp.py-5.0.0/stomp/test/setup.ini 2019-12-30 18:13:19.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/test/setup.ini 2020-01-05 11:31:43.000000000
+0100
@@ -22,6 +22,8 @@
host = my.example.com
ssl_port = 65001
-[apollo]
+[artemis]
host = 172.17.0.2
-port = 64613
\ No newline at end of file
+port = 61615
+user = testuser
+password = password
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/test/testutils.py
new/stomp.py-5.0.1/stomp/test/testutils.py
--- old/stomp.py-5.0.0/stomp/test/testutils.py 2019-12-30 18:13:19.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/test/testutils.py 2020-01-07 20:51:43.000000000
+0100
@@ -5,11 +5,11 @@
except ImportError:
from ConfigParser import RawConfigParser
import json
-import logging
import sys
from subprocess import run, PIPE
from stomp.utils import *
+from stomp import logging
config = RawConfigParser()
config.read(os.path.join(os.path.dirname(__file__), 'setup.ini'))
@@ -99,10 +99,19 @@
port = config.get('stompserver', 'port')
return [(get_environ('STOMPSERVER_HOST') or host,
int(get_environ('STOMPSERVER_PORT') or port))]
-def get_apollo_host():
- host = config.get('apollo', 'host')
- port = config.get('apollo', 'port')
- return [(get_environ('APOLLO_HOST') or host,
int(get_environ('APOLLO_PORT') or port))]
+def get_artemis_host():
+ host = config.get('artemis', 'host')
+ port = config.get('artemis', 'port')
+ return [(get_environ('ARTEMIS_HOST') or host,
int(get_environ('ARTEMIS_PORT') or port))]
+
+def get_artemis_user():
+ user = config.get('artemis', 'user')
+ return get_environ('ARTEMIS_USER') or user
+
+def get_artemis_password():
+ password = config.get('artemis', 'password')
+ return get_environ('ARTEMIS_PASSWORD') or password
+
class TestStompServer(object):
def __init__(self, host, port):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/test/transport_test.py
new/stomp.py-5.0.1/stomp/test/transport_test.py
--- old/stomp.py-5.0.0/stomp/test/transport_test.py 2019-12-30
18:13:19.000000000 +0100
+++ new/stomp.py-5.0.1/stomp/test/transport_test.py 2020-01-07
20:51:00.000000000 +0100
@@ -1,7 +1,7 @@
-import logging
import unittest
import stomp
+from stomp import logging
class TestTransport(unittest.TestCase):
@@ -13,7 +13,7 @@
self.transport.process_frame(fr, None)
def test_process_frame_empty_body(self):
- logging.getLogger().setLevel(logging.INFO)
+ logging.setLevel(logging.INFO)
fr = stomp.utils.Frame('error', {}, None)
self.transport.process_frame(fr, None)
@@ -22,6 +22,6 @@
self.transport.process_frame(fr, None)
def test_process_frame(self):
- logging.getLogger().setLevel(logging.INFO)
+ logging.setLevel(logging.INFO)
fr = stomp.utils.Frame('error', {}, 'test message')
self.transport.process_frame(fr, None)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp/transport.py
new/stomp.py-5.0.1/stomp/transport.py
--- old/stomp.py-5.0.0/stomp/transport.py 2019-12-30 18:13:19.000000000
+0100
+++ new/stomp.py-5.0.1/stomp/transport.py 2020-01-07 20:43:07.000000000
+0100
@@ -2,7 +2,6 @@
"""
import errno
-import logging
import math
import random
import sys
@@ -35,6 +34,7 @@
import stomp.exception as exception
import stomp.listener
from stomp.utils import *
+from stomp import logging
class BaseTransport(stomp.listener.Publisher):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp.py.egg-info/PKG-INFO
new/stomp.py-5.0.1/stomp.py.egg-info/PKG-INFO
--- old/stomp.py-5.0.0/stomp.py.egg-info/PKG-INFO 2020-01-04
00:31:12.000000000 +0100
+++ new/stomp.py-5.0.1/stomp.py.egg-info/PKG-INFO 2020-01-08
19:39:45.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: stomp.py
-Version: 5.0.0
+Version: 5.0.1
Summary: Python STOMP client, supporting versions 1.0, 1.1 and 1.2 of the
protocol
Home-page: https://github.com/jasonrbriggs/stomp.py
Author: Jason R Briggs
@@ -11,82 +11,66 @@
========
.. image:: https://badge.fury.io/py/stomp.py.svg
- :target: https://badge.fury.io/py/stomp.py
- :alt: PyPI version
+ :target: https://badge.fury.io/py/stomp.py
+ :alt: PyPI version
.. image:: https://travis-ci.org/jasonrbriggs/stomp.py.svg
- :target: https://travis-ci.org/jasonrbriggs/stomp.py
- :alt: Build Status
+ :target: https://travis-ci.org/jasonrbriggs/stomp.py
+ :alt: Build Status
- "stomp.py" is a Python client library for accessing messaging servers
(such as ActiveMQ_, Apollo_ or RabbitMQ_) using the STOMP_ protocol (`STOMP
v1.0`_, `STOMP v1.1`_ and `STOMP v1.2`_). It can also be run as a standalone,
command-line client for testing.
+ "stomp.py" is a Python client library for accessing messaging servers
(such as ActiveMQ_, Artemis_ or RabbitMQ_) using the STOMP_ protocol (`STOMP
v1.0`_, `STOMP v1.1`_ and `STOMP v1.2`_). It can also be run as a standalone,
command-line client for testing.
**NOTE:** Stomp.py has officially ended support for Python2.x. See
`python3statement.org`_ for more information.
- .. _STOMP: http://stomp.github.io
- .. _`STOMP v1.0`: http://stomp.github.io/stomp-specification-1.0.html
- .. _`STOMP v1.1`: http://stomp.github.io/stomp-specification-1.1.html
- .. _`STOMP v1.2`: http://stomp.github.io/stomp-specification-1.2.html
- .. _`python3statement.org`: http://python3statement.org/
+ .. contents:: \
+ :depth: 1
+
Quick Start
===========
You can connect to a message broker running on the local machine, and
send a message using the following example.
- .. code:: python
+ .. code-block:: python
import stomp
conn = stomp.Connection()
- conn.set_listener('', MyListener())
conn.connect('admin', 'password', wait=True)
conn.send(body=' '.join(sys.argv[1:]), destination='/queue/test')
conn.disconnect()
- Documentation and resources include:
- - a basic example of using stomp.py with a message listener (see the
`quick start`_)
- - `command-line interface description`_
- - installation instructions and downloads on `PyPi stomp.py page`_
- - `API documentation`_
- - current `test coverage report`_
- - `travis`_ for continuous integration builds
+ Documentation and Resources
+ ===========================
- .. _`quick start`:
http://jasonrbriggs.github.io/stomp.py/quickstart.html
- .. _`command-line interface description`:
http://jasonrbriggs.github.io/stomp.py/commandline.html
- .. _`PyPi stomp.py page`: https://pypi.org/project/stomp.py/
- .. _`API documentation`:
http://jasonrbriggs.github.io/stomp.py/api.html
- .. _`test coverage report`:
http://jasonrbriggs.github.io/stomp.py/htmlcov/
- .. _`travis`: https://travis-ci.org/jasonrbriggs/stomp.py
+ - `Main documentation`_
+ - `API documentation`_ (see `stomp.github.io`_ for details on the
STOMP protocol itself)
+ - A basic example of using stomp.py with a message listener can be
found in the `quick start`_ section of the main documentation
+ - Description of the `command-line interface`_
+ - `Travis`_ for continuous integration builds
+ - Current `test coverage report`_
+ - `PyPi stomp.py page`_
-
- Current version supports:
+ The current version of stomp.py supports:
- Python 3.x (Python2 support ended as of Jan 2020)
- STOMP version 1.0, 1.1 and 1.2
- There is also legacy 3.1.7 version using the old 3-series code (see
`3.1.7 on PyPi`_ and `3.1.7 on GitHub`_).
-
- .. _`3.1.7 on PyPi`: https://pypi.org/project/stomp.py/3.1.7/
- .. _`3.1.7 on GitHub`:
https://github.com/jasonrbriggs/stomp.py/tree/stomppy-3series
-
- stomp.py has been perfunctorily tested on:
+ There is also legacy 3.1.7 version using the old 3-series code (see
`3.1.7 on PyPi`_ and `3.1.7 on GitHub`_). This is no longer supported, but (at
least as of 2018) there were still a couple of reports of this version still
being used in the wild.
- - ActiveMQ_
- - Apollo_
- - RabbitMQ_
- - stompserver_
- .. _ActiveMQ: http://activemq.apache.org/
- .. _Apollo: http://activemq.apache.org/apollo/
- .. _RabbitMQ: http://www.rabbitmq.com
- .. _stompserver: http://stompserver.rubyforge.org
+ Testing
+ =======
- `stomp.py` has been reported to work with JBossMessaging_ in the
distant past (note: no idea whether the same is true of the replacement,
HornetQ)
+ stomp.py has been perfunctorily tested on:
- .. _JBossMessaging: http://www.jboss.org/jbossmessaging
+ - Pivotal `RabbitMQ`_ (`rabbitmq_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/rabbitmq_test.py>`_)
+ - Apache `ActiveMQ`_ (`activemq_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/activemq_test.py>`_)
+ - Apache ActiveMQ `Artemis`_ (`artemis_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/artemis_test.py>`_)
+ - `stompserver`_ (`stompserver_test.py
<https://github.com/jasonrbriggs/stomp.py/blob/dev/stomp/test/stompserver_test.py>`_)
- For testing locally, you'll need docker:
+ For testing locally, you'll need to install docker. Once installed:
#. Create the docker image:
make docker-image
@@ -98,6 +82,37 @@
make remove-docker
+ Donate
+ ======
+
+ If you find this project useful, why not `buy me a coffee`_.
+
+
+ .. _`STOMP`: http://stomp.github.io
+ .. _`STOMP v1.0`: http://stomp.github.io/stomp-specification-1.0.html
+ .. _`STOMP v1.1`: http://stomp.github.io/stomp-specification-1.1.html
+ .. _`STOMP v1.2`: http://stomp.github.io/stomp-specification-1.2.html
+ .. _`python3statement.org`: http://python3statement.org/
+
+ .. _`Main documentation`:
http://jasonrbriggs.github.io/stomp.py/index.html
+ .. _`stomp.github.io`: http://stomp.github.io/
+ .. _`quick start`:
http://jasonrbriggs.github.io/stomp.py/quickstart.html
+ .. _`command-line interface`:
http://jasonrbriggs.github.io/stomp.py/commandline.html
+ .. _`PyPi stomp.py page`: https://pypi.org/project/stomp.py/
+ .. _`API documentation`:
http://jasonrbriggs.github.io/stomp.py/api.html
+ .. _`test coverage report`:
http://jasonrbriggs.github.io/stomp.py/htmlcov/
+ .. _`Travis`: https://travis-ci.org/jasonrbriggs/stomp.py
+
+ .. _`3.1.7 on PyPi`: https://pypi.org/project/stomp.py/3.1.7/
+ .. _`3.1.7 on GitHub`:
https://github.com/jasonrbriggs/stomp.py/tree/stomppy-3series
+
+ .. _`ActiveMQ`: http://activemq.apache.org/
+ .. _`Artemis`: https://activemq.apache.org/components/artemis/
+ .. _`RabbitMQ`: http://www.rabbitmq.com
+ .. _`stompserver`: http://stompserver.rubyforge.org
+
+ .. _`buy me a coffee`: https://www.paypal.me/jasonrbriggs
+
Platform: any
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomp.py-5.0.0/stomp.py.egg-info/SOURCES.txt
new/stomp.py-5.0.1/stomp.py.egg-info/SOURCES.txt
--- old/stomp.py-5.0.0/stomp.py.egg-info/SOURCES.txt 2020-01-04
00:31:12.000000000 +0100
+++ new/stomp.py-5.0.1/stomp.py.egg-info/SOURCES.txt 2020-01-08
19:39:45.000000000 +0100
@@ -13,6 +13,7 @@
stomp/constants.py
stomp/exception.py
stomp/listener.py
+stomp/logging.py
stomp/protocol.py
stomp/transport.py
stomp/utils.py
@@ -26,7 +27,7 @@
stomp/adapter/multicast.py
stomp/test/__init__.py
stomp/test/activemq_test.py
-stomp/test/apollo_test.py
+stomp/test/artemis_test.py
stomp/test/basic_test.py
stomp/test/cli_ssl_test.py
stomp/test/cli_test.py
