Hello community,
here is the log from the commit of package python-stomper for
openSUSE:Leap:15.2 checked in at 2020-03-02 13:23:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-stomper (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-stomper.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-stomper"
Mon Mar 2 13:23:34 2020 rev:11 rq:777187 version:0.4.3
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-stomper/python-stomper.changes
2020-01-15 15:53:38.959604987 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-stomper.new.26092/python-stomper.changes
2020-03-02 13:23:35.234425786 +0100
@@ -1,0 +2,26 @@
+Thu Apr 18 16:03:40 UTC 2019 - Marketa Calabkova <[email protected]>
+
+- update to version 0.4.3
+ * Added missing attribution to contributors section and messed up
+ 0.4.2 release to new pypi.
+ * Thanks to https://github.com/pgajdos for contributing a fix to
+ include the license in the distribution.
+- removed LICENSE (now it is included).
+
+-------------------------------------------------------------------
+Tue Mar 26 12:25:17 UTC 2019 - Jan Engelhardt <[email protected]>
+
+- Avoid repetition of project name or self in summary (rpmlint).
+
+-------------------------------------------------------------------
+Tue Mar 26 09:05:56 UTC 2019 - [email protected]
+
+- version update to 0.4.1
+ * python3 support
+ * utf-8 encoding under python3
+- build also python3 variant
+- drop SLE11 support
+- run fdupes
+- include LICENSE
+
+-------------------------------------------------------------------
Old:
----
stomper-0.3.0.tar.gz
New:
----
stomper-0.4.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-stomper.spec ++++++
--- /var/tmp/diff_new_pack.iEtQbZ/_old 2020-03-02 13:23:35.538426390 +0100
+++ /var/tmp/diff_new_pack.iEtQbZ/_new 2020-03-02 13:23:35.538426390 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-stomper
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,28 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-stomper
-Version: 0.3.0
+Version: 0.4.3
Release: 0
-Summary: This is a transport neutral client implementation of the STOMP
protocol
+Summary: Transport neutral client implementation of the STOMP protocol
License: Apache-2.0
Group: Development/Languages/Python
-Url: http://code.google.com/p/stomper
-Source:
http://pypi.python.org/packages/source/s/stomper/stomper-%{version}.tar.gz
-BuildRequires: python-devel
-BuildRequires: python-nose
-BuildRequires: python-setuptools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
+URL: https://code.google.com/p/stomper
+Source0:
https://files.pythonhosted.org/packages/source/s/stomper/stomper-%{version}.tar.gz
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
BuildArch: noarch
-%endif
+# SECTION test requirements
+BuildRequires: %{python_module future}
+BuildRequires: %{python_module nose}
+BuildRequires: %{python_module setuptools}
+# /SECTION
+%python_subpackages
%description
This is a python client implementation of the STOMP protocol.
@@ -46,17 +47,18 @@
%setup -q -n stomper-%{version}
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-nosetests
+%python_expand nosetests-%{$python_bin_suffix}
-%files
-%defattr(-,root,root,-)
+%files %{python_files}
%doc README.rst lib/stomper/examples
+%license LICENSE
%{python_sitelib}/*
%changelog
++++++ stomper-0.3.0.tar.gz -> stomper-0.4.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/LICENSE new/stomper-0.4.3/LICENSE
--- old/stomper-0.3.0/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/stomper-0.4.3/LICENSE 2019-04-09 13:24:51.000000000 +0200
@@ -0,0 +1,202 @@
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/MANIFEST.in
new/stomper-0.4.3/MANIFEST.in
--- old/stomper-0.3.0/MANIFEST.in 2014-09-12 16:35:09.000000000 +0200
+++ new/stomper-0.4.3/MANIFEST.in 2019-04-09 13:24:51.000000000 +0200
@@ -1 +1,2 @@
include README.rst
+include LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/PKG-INFO new/stomper-0.4.3/PKG-INFO
--- old/stomper-0.3.0/PKG-INFO 2014-09-18 12:08:05.000000000 +0200
+++ new/stomper-0.4.3/PKG-INFO 2019-04-09 13:54:22.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: stomper
-Version: 0.3.0
+Version: 0.4.3
Summary: This is a transport neutral client implementation of the STOMP
protocol.
Home-page: https://github.com/oisinmulvihill/stomper
Author: Oisin Mulvihill
-Author-email: oisin dot mulvihill at gmail com
+Author-email: [email protected]
License: http://www.apache.org/licenses/LICENSE-2.0
Description: =======
Stomper
@@ -23,6 +23,9 @@
- Ian Weller <https://github.com/ianweller>,
- Daniele Varrazzo <https://github.com/dvarrazzo>
- Ralph Bean <http://threebean.org>
+ - Lumír 'Frenzy' Balhar <https://github.com/frenzymadness>
+ - Ralph Bean (https://github.com/ralphbean)
+ - https://github.com/pgajdos
Introduction
@@ -77,6 +80,35 @@
I've also included ``stompbuffer-rx.py`` and ``stompbuffer-tx.py`` as
examples of using
the new stompbuffer module contributed by Ricky Iacovou.
+
+ Release Process
+ ---------------
+
+ Submit a pull request with tests if possible. I'll review and submit.
All tests
+ must pass. I tend to run against python3.7 nowadays. I will then
increment the
+ version, add attribute and then release to pypi if all is good.
+
+ Help Oisin remember the relase process::
+
+ # clean env for release:
+ mkvirtualenv --clear -p python3.7 stomper
+
+ # setup and run all tests:
+ python setup.py develop
+ python setup.py test
+
+ # Build and release to test.pypi.org first:
+ pip install twine
+ python setup.py sdist bdist_wheel
+ twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+ # On success
+ twine upload dist/*
+
+ # Commit any changes and tag the release
+ git tag X.Y.Z
+
+
Supported STOMP Versions
------------------------
@@ -103,6 +135,31 @@
Version History
---------------
+ 0.4.3
+ ~~~~~
+
+ Added missing attribution to contributors section and messed up 0.4.2
release
+ to new pypi.
+
+ 0.4.2
+ ~~~~~
+
+ Thanks to https://github.com/pgajdos for contributing a fix to include
the
+ license in the distribution. OM: Added minor fix to support
test.pypi.org
+ uploading before releasing. Document my release process to help me
next time
+ around.
+
+ 0.4.1
+ ~~~~~
+
+ Thanks to Ralph Bean (https://github.com/ralphbean) contributing a fix
to setup.py and utf-8 encoding under python3.
+
+ 0.4.0
+ ~~~~~
+
+ Thanks to Lumír 'Frenzy' Balhar (https://github.com/frenzymadness)
contributing
+ python3 support.
+
0.3.0
~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/README.rst new/stomper-0.4.3/README.rst
--- old/stomper-0.3.0/README.rst 2014-09-12 17:42:43.000000000 +0200
+++ new/stomper-0.4.3/README.rst 2019-04-09 13:53:08.000000000 +0200
@@ -15,6 +15,9 @@
- Ian Weller <https://github.com/ianweller>,
- Daniele Varrazzo <https://github.com/dvarrazzo>
- Ralph Bean <http://threebean.org>
+ - Lumír 'Frenzy' Balhar <https://github.com/frenzymadness>
+ - Ralph Bean (https://github.com/ralphbean)
+ - https://github.com/pgajdos
Introduction
@@ -69,6 +72,35 @@
I've also included ``stompbuffer-rx.py`` and ``stompbuffer-tx.py`` as
examples of using
the new stompbuffer module contributed by Ricky Iacovou.
+
+Release Process
+---------------
+
+Submit a pull request with tests if possible. I'll review and submit. All tests
+must pass. I tend to run against python3.7 nowadays. I will then increment the
+version, add attribute and then release to pypi if all is good.
+
+Help Oisin remember the relase process::
+
+ # clean env for release:
+ mkvirtualenv --clear -p python3.7 stomper
+
+ # setup and run all tests:
+ python setup.py develop
+ python setup.py test
+
+ # Build and release to test.pypi.org first:
+ pip install twine
+ python setup.py sdist bdist_wheel
+ twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+ # On success
+ twine upload dist/*
+
+ # Commit any changes and tag the release
+ git tag X.Y.Z
+
+
Supported STOMP Versions
------------------------
@@ -95,6 +127,31 @@
Version History
---------------
+0.4.3
+~~~~~
+
+Added missing attribution to contributors section and messed up 0.4.2 release
+to new pypi.
+
+0.4.2
+~~~~~
+
+Thanks to https://github.com/pgajdos for contributing a fix to include the
+license in the distribution. OM: Added minor fix to support test.pypi.org
+uploading before releasing. Document my release process to help me next time
+around.
+
+0.4.1
+~~~~~
+
+Thanks to Ralph Bean (https://github.com/ralphbean) contributing a fix to
setup.py and utf-8 encoding under python3.
+
+0.4.0
+~~~~~
+
+Thanks to Lumír 'Frenzy' Balhar (https://github.com/frenzymadness) contributing
+python3 support.
+
0.3.0
~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/__init__.py
new/stomper-0.4.3/lib/stomper/__init__.py
--- old/stomper-0.3.0/lib/stomper/__init__.py 2014-09-12 17:22:17.000000000
+0200
+++ new/stomper-0.4.3/lib/stomper/__init__.py 2019-04-09 13:24:51.000000000
+0200
@@ -1,4 +1,5 @@
-from stomp_11 import (
+from __future__ import absolute_import
+from .stomp_11 import (
Engine,
Frame,
FrameError,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/examples/receiver.py
new/stomper-0.4.3/lib/stomper/examples/receiver.py
--- old/stomper-0.3.0/lib/stomper/examples/receiver.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/examples/receiver.py 2019-04-09
13:24:51.000000000 +0200
@@ -5,6 +5,8 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import print_function
+from builtins import str
import uuid
import logging
import itertools
@@ -104,13 +106,13 @@
def clientConnectionLost(self, connector, reason):
"""Lost connection
"""
- print 'Lost connection. Reason:', reason
+ print('Lost connection. Reason:', reason)
def clientConnectionFailed(self, connector, reason):
"""Connection failed
"""
- print 'Connection failed. Reason:', reason
+ print('Connection failed. Reason:', reason)
ReconnectingClientFactory.clientConnectionFailed(self, connector,
reason)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/examples/sender.py
new/stomper-0.4.3/lib/stomper/examples/sender.py
--- old/stomper-0.3.0/lib/stomper/examples/sender.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/examples/sender.py 2019-04-09
13:24:51.000000000 +0200
@@ -5,6 +5,8 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import print_function
+from builtins import str
import uuid
import logging
import itertools
@@ -75,7 +77,7 @@
def send(self):
"""Send out a hello message periodically.
"""
- counter = self.counter.next()
+ counter = next(self.counter)
self.log.info("senderID:%s Saying hello (%d)." % (self.senderID,
counter))
@@ -127,13 +129,13 @@
def clientConnectionLost(self, connector, reason):
"""Lost connection
"""
- print 'Lost connection. Reason:', reason
+ print('Lost connection. Reason:', reason)
def clientConnectionFailed(self, connector, reason):
"""Connection failed
"""
- print 'Connection failed. Reason:', reason
+ print('Connection failed. Reason:', reason)
ReconnectingClientFactory.clientConnectionFailed(self, connector,
reason)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/examples/stompbuffer-rx.py
new/stomper-0.4.3/lib/stomper/examples/stompbuffer-rx.py
--- old/stomper-0.3.0/lib/stomper/examples/stompbuffer-rx.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/examples/stompbuffer-rx.py 2019-04-09
13:24:51.000000000 +0200
@@ -5,6 +5,7 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import print_function
import logging
from twisted.internet import reactor
@@ -106,13 +107,13 @@
def clientConnectionLost(self, connector, reason):
"""Lost connection
"""
- print 'Lost connection. Reason:', reason
+ print('Lost connection. Reason:', reason)
def clientConnectionFailed(self, connector, reason):
"""Connection failed
"""
- print 'Connection failed. Reason:', reason
+ print('Connection failed. Reason:', reason)
ReconnectingClientFactory.clientConnectionFailed(self, connector,
reason)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/examples/stompbuffer-tx.py
new/stomper-0.4.3/lib/stomper/examples/stompbuffer-tx.py
--- old/stomper-0.3.0/lib/stomper/examples/stompbuffer-tx.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/examples/stompbuffer-tx.py 2019-04-09
13:24:51.000000000 +0200
@@ -5,6 +5,7 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import print_function
import logging
from twisted.internet import reactor
@@ -117,13 +118,13 @@
def clientConnectionLost(self, connector, reason):
"""Lost connection
"""
- print 'Lost connection. Reason:', reason
+ print('Lost connection. Reason:', reason)
def clientConnectionFailed(self, connector, reason):
"""Connection failed
"""
- print 'Connection failed. Reason:', reason
+ print('Connection failed. Reason:', reason)
ReconnectingClientFactory.clientConnectionFailed(self, connector,
reason)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/examples/stomper_usage.py
new/stomper-0.4.3/lib/stomper/examples/stomper_usage.py
--- old/stomper-0.3.0/lib/stomper/examples/stomper_usage.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/examples/stomper_usage.py 2019-04-09
13:24:51.000000000 +0200
@@ -6,6 +6,7 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import print_function
import pprint
import stomper
@@ -15,7 +16,7 @@
# Generate the connect command to tell the server about us:
msg = stomper.connect('bob','1234')
-print "msg:\n%s\n" % pprint.pformat(msg)
+print("msg:\n%s\n" % pprint.pformat(msg))
#>>> 'CONNECT\nlogin:bob\npasscode:1234\n\n\x00\n'
@@ -72,7 +73,7 @@
# ACK message:
response = responder.react(server_msg)
-print "response:\n%s\n" % pprint.pformat(response)
+print("response:\n%s\n" % pprint.pformat(response))
#>>> 'ACK\nmessage-id: some-message-id\n\n\x00\n'
@@ -86,7 +87,7 @@
def ack(self, msg):
"""Override this and do some customer message handler.
"""
- print "Got a message:\n%s\n" % msg['body']
+ print("Got a message:\n%s\n" % msg['body'])
# do something with the message...
@@ -96,7 +97,7 @@
responder2 = Pong()
response = responder2.react(server_msg)
-print "response:\n%s\n" % pprint.pformat(response)
+print("response:\n%s\n" % pprint.pformat(response))
#>>> 'ACK\nmessage-id: some-message-id\n\n\x00\n'
@@ -105,7 +106,7 @@
# 1. using the the function for send()
send_message = stomper.send(DESTINATION, 'hello there')
-print "1. send_message:\n%s\n" % pprint.pformat(send_message)
+print("1. send_message:\n%s\n" % pprint.pformat(send_message))
#>>> 'SEND\ndestination: /queue/inbox\n\nhello there\x00\n'
@@ -115,7 +116,7 @@
msg.cmd = 'SEND'
msg.headers = {'destination':'/queue/a','custom-header':'1234'}
msg.body = "hello queue a"
-print "2. send_message:\n%s\n" % pprint.pformat(msg.pack())
+print("2. send_message:\n%s\n" % pprint.pformat(msg.pack()))
#>>> 'SEND\ncustom-header:1234\ndestination:/queue/a\n\nhello queue
a\n\n\x00\n'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/stomp_10.py
new/stomper-0.4.3/lib/stomper/stomp_10.py
--- old/stomper-0.3.0/lib/stomper/stomp_10.py 2014-09-12 16:40:57.000000000
+0200
+++ new/stomper-0.4.3/lib/stomper/stomp_10.py 2019-04-09 13:24:51.000000000
+0200
@@ -29,14 +29,16 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import absolute_import
+from builtins import object
import re
import uuid
import types
import logging
-import utils
-import stompbuffer
+from . import utils
+from . import stompbuffer
# This is used as a return from message responses functions.
# It is used more for readability more then anything or reason.
@@ -60,6 +62,11 @@
'RECEIPT', 'ERROR',
]
+try:
+ stringTypes = (str, unicode)
+except NameError:
+ stringTypes = (str,)
+
def get_log():
return logging.getLogger("stomper")
@@ -409,14 +416,14 @@
# If its not a string assume its a dict.
mtype = type(msg)
- if mtype in types.StringTypes:
+ if mtype in stringTypes:
msg = unpack_frame(msg)
- elif mtype == types.DictType:
+ elif mtype == dict:
pass
else:
raise FrameError("Unknown message type '%s', I don't know what to
do with this!" % mtype)
- if self.states.has_key(msg['cmd']):
+ if msg['cmd'] in self.states:
# print("reacting to message - %s" % msg['cmd'])
returned = self.states[msg['cmd']](msg)
@@ -451,7 +458,7 @@
message_id = msg['headers']['message-id']
transaction_id = None
- if msg['headers'].has_key('transaction-id'):
+ if 'transaction-id' in msg['headers']:
transaction_id = msg['headers']['transaction-id']
# print "acknowledging message id <%s>." % message_id
@@ -471,7 +478,7 @@
body = msg['body'].replace(NULL, '')
brief_msg = ""
- if msg['headers'].has_key('message'):
+ if 'message' in msg['headers']:
brief_msg = msg['headers']['message']
self.log.error("Received server error - message%s\n\n%s" % (brief_msg,
body))
@@ -495,7 +502,7 @@
body = msg['body'].replace(NULL, '')
brief_msg = ""
- if msg['headers'].has_key('receipt-id'):
+ if 'receipt-id' in msg['headers']:
brief_msg = msg['headers']['receipt-id']
self.log.info("Received server receipt message - receipt-id:%s\n\n%s"
% (brief_msg, body))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/stomp_11.py
new/stomper-0.4.3/lib/stomper/stomp_11.py
--- old/stomper-0.3.0/lib/stomper/stomp_11.py 2014-09-12 17:21:29.000000000
+0200
+++ new/stomper-0.4.3/lib/stomper/stomp_11.py 2019-04-09 13:24:51.000000000
+0200
@@ -30,14 +30,16 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from __future__ import absolute_import
+from builtins import object
import re
import uuid
import types
import logging
-import utils
-import stompbuffer
+from . import utils
+from . import stompbuffer
# This is used as a return from message responses functions.
# It is used more for readability more then anything or reason.
@@ -61,6 +63,11 @@
'RECEIPT', 'ERROR',
]
+try:
+ stringTypes = (str, unicode)
+except NameError:
+ stringTypes = (str,)
+
def get_log():
return logging.getLogger("stomper")
@@ -449,14 +456,14 @@
# If its not a string assume its a dict.
mtype = type(msg)
- if mtype in types.StringTypes:
+ if mtype in stringTypes:
msg = unpack_frame(msg)
- elif mtype == types.DictType:
+ elif mtype == dict:
pass
else:
raise FrameError("Unknown message type '%s', I don't know what to
do with this!" % mtype)
- if self.states.has_key(msg['cmd']):
+ if msg['cmd'] in self.states:
# print("reacting to message - %s" % msg['cmd'])
returned = self.states[msg['cmd']](msg)
@@ -492,7 +499,7 @@
subscription = msg['headers']['subscription']
transaction_id = None
- if msg['headers'].has_key('transaction-id'):
+ if 'transaction-id' in msg['headers']:
transaction_id = msg['headers']['transaction-id']
# print "acknowledging message id <%s>." % message_id
@@ -512,7 +519,7 @@
body = msg['body'].replace(NULL, '')
brief_msg = ""
- if msg['headers'].has_key('message'):
+ if 'message' in msg['headers']:
brief_msg = msg['headers']['message']
self.log.error("Received server error - message%s\n\n%s" % (brief_msg,
body))
@@ -536,7 +543,7 @@
body = msg['body'].replace(NULL, '')
brief_msg = ""
- if msg['headers'].has_key('receipt-id'):
+ if 'receipt-id' in msg['headers']:
brief_msg = msg['headers']['receipt-id']
self.log.info("Received server receipt message - receipt-id:%s\n\n%s"
% (brief_msg, body))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/stompbuffer.py
new/stomper-0.4.3/lib/stomper/stompbuffer.py
--- old/stomper-0.3.0/lib/stomper/stompbuffer.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/stompbuffer.py 2019-04-09
13:24:51.000000000 +0200
@@ -6,6 +6,7 @@
License: http://www.apache.org/licenses/LICENSE-2.0
"""
+from builtins import object
import re
import stomper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper/tests/teststompbuffer.py
new/stomper-0.4.3/lib/stomper/tests/teststompbuffer.py
--- old/stomper-0.3.0/lib/stomper/tests/teststompbuffer.py 2014-09-12
16:35:09.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper/tests/teststompbuffer.py 2019-04-09
13:24:51.000000000 +0200
@@ -30,7 +30,7 @@
def messageIsGood ( msg, body = BODY, cmd = CMD ):
if msg is None:
return False
- if type ( msg ) != types.DictType:
+ if type ( msg ) != dict:
return False
if msg [ 'cmd' ] != cmd:
return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper.egg-info/PKG-INFO
new/stomper-0.4.3/lib/stomper.egg-info/PKG-INFO
--- old/stomper-0.3.0/lib/stomper.egg-info/PKG-INFO 2014-09-18
12:07:57.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper.egg-info/PKG-INFO 2019-04-09
13:54:22.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: stomper
-Version: 0.3.0
+Version: 0.4.3
Summary: This is a transport neutral client implementation of the STOMP
protocol.
Home-page: https://github.com/oisinmulvihill/stomper
Author: Oisin Mulvihill
-Author-email: oisin dot mulvihill at gmail com
+Author-email: [email protected]
License: http://www.apache.org/licenses/LICENSE-2.0
Description: =======
Stomper
@@ -23,6 +23,9 @@
- Ian Weller <https://github.com/ianweller>,
- Daniele Varrazzo <https://github.com/dvarrazzo>
- Ralph Bean <http://threebean.org>
+ - Lumír 'Frenzy' Balhar <https://github.com/frenzymadness>
+ - Ralph Bean (https://github.com/ralphbean)
+ - https://github.com/pgajdos
Introduction
@@ -77,6 +80,35 @@
I've also included ``stompbuffer-rx.py`` and ``stompbuffer-tx.py`` as
examples of using
the new stompbuffer module contributed by Ricky Iacovou.
+
+ Release Process
+ ---------------
+
+ Submit a pull request with tests if possible. I'll review and submit.
All tests
+ must pass. I tend to run against python3.7 nowadays. I will then
increment the
+ version, add attribute and then release to pypi if all is good.
+
+ Help Oisin remember the relase process::
+
+ # clean env for release:
+ mkvirtualenv --clear -p python3.7 stomper
+
+ # setup and run all tests:
+ python setup.py develop
+ python setup.py test
+
+ # Build and release to test.pypi.org first:
+ pip install twine
+ python setup.py sdist bdist_wheel
+ twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+ # On success
+ twine upload dist/*
+
+ # Commit any changes and tag the release
+ git tag X.Y.Z
+
+
Supported STOMP Versions
------------------------
@@ -103,6 +135,31 @@
Version History
---------------
+ 0.4.3
+ ~~~~~
+
+ Added missing attribution to contributors section and messed up 0.4.2
release
+ to new pypi.
+
+ 0.4.2
+ ~~~~~
+
+ Thanks to https://github.com/pgajdos for contributing a fix to include
the
+ license in the distribution. OM: Added minor fix to support
test.pypi.org
+ uploading before releasing. Document my release process to help me
next time
+ around.
+
+ 0.4.1
+ ~~~~~
+
+ Thanks to Ralph Bean (https://github.com/ralphbean) contributing a fix
to setup.py and utf-8 encoding under python3.
+
+ 0.4.0
+ ~~~~~
+
+ Thanks to Lumír 'Frenzy' Balhar (https://github.com/frenzymadness)
contributing
+ python3 support.
+
0.3.0
~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper.egg-info/SOURCES.txt
new/stomper-0.4.3/lib/stomper.egg-info/SOURCES.txt
--- old/stomper-0.3.0/lib/stomper.egg-info/SOURCES.txt 2014-09-18
12:07:58.000000000 +0200
+++ new/stomper-0.4.3/lib/stomper.egg-info/SOURCES.txt 2019-04-09
13:54:22.000000000 +0200
@@ -1,3 +1,4 @@
+LICENSE
MANIFEST.in
README.rst
runtests.py
@@ -10,6 +11,7 @@
lib/stomper.egg-info/PKG-INFO
lib/stomper.egg-info/SOURCES.txt
lib/stomper.egg-info/dependency_links.txt
+lib/stomper.egg-info/requires.txt
lib/stomper.egg-info/top_level.txt
lib/stomper/examples/__init__.py
lib/stomper/examples/receiver.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/lib/stomper.egg-info/requires.txt
new/stomper-0.4.3/lib/stomper.egg-info/requires.txt
--- old/stomper-0.3.0/lib/stomper.egg-info/requires.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/stomper-0.4.3/lib/stomper.egg-info/requires.txt 2019-04-09
13:54:22.000000000 +0200
@@ -0,0 +1 @@
+future
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/setup.cfg new/stomper-0.4.3/setup.cfg
--- old/stomper-0.3.0/setup.cfg 2014-09-18 12:08:05.000000000 +0200
+++ new/stomper-0.4.3/setup.cfg 2019-04-09 13:54:22.000000000 +0200
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/stomper-0.3.0/setup.py new/stomper-0.4.3/setup.py
--- old/stomper-0.3.0/setup.py 2014-09-12 17:18:44.000000000 +0200
+++ new/stomper-0.4.3/setup.py 2019-04-09 13:51:48.000000000 +0200
@@ -11,9 +11,9 @@
Name = 'stomper'
ProjectUrl = "https://github.com/oisinmulvihill/stomper";
-Version = '0.3.0'
+Version = '0.4.3'
Author = 'Oisin Mulvihill'
-AuthorEmail = 'oisin dot mulvihill at gmail com'
+AuthorEmail = '[email protected]'
Maintainer = 'Oisin Mulvihill'
Summary = (
'This is a transport neutral client implementation '
@@ -32,9 +32,7 @@
]
# Recover the ReStructuredText docs:
-fd = file("README.rst")
-Description = fd.read()
-fd.close()
+Description = open("README.rst", "rb").read().decode("utf-8")
TestSuite = 'stomper.tests'
@@ -47,7 +45,7 @@
}
-needed = []
+needed = ['future']
if sys.version_info < (2, 5):
needed += [
'uuid>=1.2',
