Hello community,
here is the log from the commit of package python-amqp for openSUSE:Factory
checked in at 2018-07-02 23:32:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-amqp (Old)
and /work/SRC/openSUSE:Factory/.python-amqp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-amqp"
Mon Jul 2 23:32:53 2018 rev:25 rq:620010 version:2.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-amqp/python-amqp.changes 2018-05-29
10:49:08.899131254 +0200
+++ /work/SRC/openSUSE:Factory/.python-amqp.new/python-amqp.changes
2018-07-02 23:33:09.125271449 +0200
@@ -1,0 +2,21 @@
+Sun Jul 1 02:15:08 UTC 2018 - a...@gmx.de
+
+- specfile:
+ * added dependency pytest-sugar
+
+-------------------------------------------------------------------
+Sun Jun 24 15:30:55 UTC 2018 - a...@gmx.de
+
+- update to version 2.3.2:
+ * Fix a regression that occurs when running amqp under Python 2.7 on
+ OSX. TCP_USER_TIMEOUT is not available when running on OSX. We
+ now remove it from the set of known TCP options.
+
+- changes from version 2.3.1:
+ * Fix a regression that occurs when running amqp under Python 2.7.
+ #182 mistakingly replaced a type check with unicode to string_t
+ which is str in Python 2.7. text_t should have been used instead.
+ This is now fixed and the tests have been adjusted to ensure this
+ never regresses again.
+
+-------------------------------------------------------------------
Old:
----
amqp-2.3.0.tar.gz
New:
----
amqp-2.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-amqp.spec ++++++
--- /var/tmp/diff_new_pack.GmA4XJ/_old 2018-07-02 23:33:09.641270809 +0200
+++ /var/tmp/diff_new_pack.GmA4XJ/_new 2018-07-02 23:33:09.649270799 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-amqp
-Version: 2.3.0
+Version: 2.3.2
Release: 0
Summary: Low-level AMQP client for Python (fork of amqplib)
License: LGPL-2.1-or-later
@@ -27,6 +27,7 @@
Source:
https://files.pythonhosted.org/packages/source/a/amqp/amqp-%{version}.tar.gz
Source99: %{name}.changes
BuildRequires: %{python_module case}
+BuildRequires: %{python_module pytest-sugar}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module sasl}
BuildRequires: %{python_module setuptools}
++++++ amqp-2.3.0.tar.gz -> amqp-2.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/Changelog new/amqp-2.3.2/Changelog
--- old/amqp-2.3.0/Changelog 2018-05-27 15:22:50.000000000 +0200
+++ new/amqp-2.3.2/Changelog 2018-05-30 14:35:18.000000000 +0200
@@ -5,6 +5,36 @@
The previous amqplib changelog is here:
http://code.google.com/p/py-amqplib/source/browse/CHANGES
+.. _version-2.3.1:
+
+2.3.1
+=====
+:release-date: 2018-05-28 16:30 P.M UTC+3
+:release-by: Omer Katz
+
+- Fix a regression that occurs when running amqp under Python 2.7.
+
+ #182 mistakingly replaced a type check with unicode to string_t which is str
+ in Python 2.7. text_t should have been used instead.
+ This is now fixed and the tests have been adjusted to ensure this never
regresses
+ again.
+
+ Fix contributed by **Omer Katz**
+
+.. _version-2.3.2:
+
+2.3.2
+=====
+:release-date: 2018-05-29 15:30 P.M UTC+3
+:release-by: Omer Katz
+
+- Fix a regression that occurs when running amqp under Python 2.7 on OSX.
+
+ TCP_USER_TIMEOUT is not available when running on OSX.
+ We now remove it from the set of known TCP options.
+
+ Fix contributed by **Ofer Horowitz**
+
.. _version-2.3.0:
2.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/PKG-INFO new/amqp-2.3.2/PKG-INFO
--- old/amqp-2.3.0/PKG-INFO 2018-05-27 15:25:34.000000000 +0200
+++ new/amqp-2.3.2/PKG-INFO 2018-05-30 14:36:41.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: amqp
-Version: 2.3.0
+Version: 2.3.2
Summary: Low-level AMQP client for Python (fork of amqplib).
Home-page: http://github.com/celery/py-amqp
Author: Barry Pederson
@@ -13,7 +13,7 @@
|build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
- :Version: 2.3.0
+ :Version: 2.3.2
: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-2.3.0/README.rst new/amqp-2.3.2/README.rst
--- old/amqp-2.3.0/README.rst 2018-05-27 15:24:30.000000000 +0200
+++ new/amqp-2.3.2/README.rst 2018-05-30 14:36:25.000000000 +0200
@@ -4,7 +4,7 @@
|build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
-:Version: 2.3.0
+:Version: 2.3.2
: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-2.3.0/amqp/__init__.py
new/amqp-2.3.2/amqp/__init__.py
--- old/amqp-2.3.0/amqp/__init__.py 2018-05-27 15:24:30.000000000 +0200
+++ new/amqp-2.3.2/amqp/__init__.py 2018-05-30 14:36:25.000000000 +0200
@@ -6,7 +6,7 @@
from collections import namedtuple
-__version__ = '2.3.0'
+__version__ = '2.3.2'
__author__ = 'Barry Pederson'
__maintainer__ = 'Ask Solem'
__contact__ = 'pya...@celeryproject.org'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/amqp/platform.py
new/amqp-2.3.2/amqp/platform.py
--- old/amqp-2.3.0/amqp/platform.py 2017-12-17 10:41:38.000000000 +0100
+++ new/amqp-2.3.2/amqp/platform.py 2018-05-30 14:20:43.000000000 +0200
@@ -48,6 +48,8 @@
if platform.release().endswith("Microsoft"):
KNOWN_TCP_OPTS = {'TCP_NODELAY', 'TCP_KEEPIDLE', 'TCP_KEEPINTVL',
'TCP_KEEPCNT'}
+elif sys.platform.startswith('darwin'):
+ KNOWN_TCP_OPTS.remove('TCP_USER_TIMEOUT')
# According to MSDN Windows platforms support getsockopt(TCP_MAXSSEG) but not
# setsockopt(TCP_MAXSEG) on IPPROTO_TCP sockets.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/amqp/utils.py new/amqp-2.3.2/amqp/utils.py
--- old/amqp-2.3.0/amqp/utils.py 2018-03-08 14:44:43.000000000 +0100
+++ new/amqp-2.3.2/amqp/utils.py 2018-05-28 15:36:40.000000000 +0200
@@ -2,15 +2,12 @@
from __future__ import absolute_import, unicode_literals
import logging
-import sys
# enables celery 3.1.23 to start again
from vine import promise # noqa
from vine.utils import wraps
-from .five import string_t
-
-is_py3k = sys.version_info[0] == 3
+from .five import PY3, string_t, text_t
try:
import fcntl
@@ -68,7 +65,7 @@
return _boot
-if is_py3k: # pragma: no cover
+if PY3: # pragma: no cover
def str_to_bytes(s):
"""Convert str to bytes."""
@@ -85,7 +82,7 @@
def str_to_bytes(s): # noqa
"""Convert str to bytes."""
- if isinstance(s, string_t):
+ if isinstance(s, text_t):
return s.encode('utf-8')
return s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/amqp.egg-info/PKG-INFO
new/amqp-2.3.2/amqp.egg-info/PKG-INFO
--- old/amqp-2.3.0/amqp.egg-info/PKG-INFO 2018-05-27 15:25:34.000000000
+0200
+++ new/amqp-2.3.2/amqp.egg-info/PKG-INFO 2018-05-30 14:36:41.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: amqp
-Version: 2.3.0
+Version: 2.3.2
Summary: Low-level AMQP client for Python (fork of amqplib).
Home-page: http://github.com/celery/py-amqp
Author: Barry Pederson
@@ -13,7 +13,7 @@
|build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
- :Version: 2.3.0
+ :Version: 2.3.2
: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-2.3.0/docs/conf.py new/amqp-2.3.2/docs/conf.py
--- old/amqp-2.3.0/docs/conf.py 2017-10-28 10:47:38.000000000 +0200
+++ new/amqp-2.3.2/docs/conf.py 2018-05-28 15:54:04.000000000 +0200
@@ -7,8 +7,8 @@
'amqp', __file__,
project='py-amqp',
description='Python Promises',
- version_dev='2.3',
- version_stable='2.2',
+ version_dev='2.4',
+ version_stable='2.3',
canonical_url='https://amqp.readthedocs.io',
webdomain='celeryproject.org',
github_project='celery/py-amqp',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/docs/includes/introduction.txt
new/amqp-2.3.2/docs/includes/introduction.txt
--- old/amqp-2.3.0/docs/includes/introduction.txt 2018-05-27
15:24:30.000000000 +0200
+++ new/amqp-2.3.2/docs/includes/introduction.txt 2018-05-30
14:36:25.000000000 +0200
@@ -1,4 +1,4 @@
-:Version: 2.3.0
+:Version: 2.3.2
: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-2.3.0/requirements/test.txt
new/amqp-2.3.2/requirements/test.txt
--- old/amqp-2.3.0/requirements/test.txt 2017-07-14 07:51:21.000000000
+0200
+++ new/amqp-2.3.2/requirements/test.txt 2018-05-28 15:23:44.000000000
+0200
@@ -1,2 +1,3 @@
case>=1.3.1
pytest>=3.0
+pytest-sugar>=0.9.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/t/unit/test_connection.py
new/amqp-2.3.2/t/unit/test_connection.py
--- old/amqp-2.3.0/t/unit/test_connection.py 2018-03-08 14:44:43.000000000
+0100
+++ new/amqp-2.3.2/t/unit/test_connection.py 2018-05-28 15:36:39.000000000
+0200
@@ -10,7 +10,7 @@
from amqp.connection import SSLError
from amqp.exceptions import ConnectionError, NotFound, ResourceError
from amqp.five import items
-from amqp.sasl import AMQPLAIN, PLAIN, SASL, EXTERNAL, GSSAPI
+from amqp.sasl import AMQPLAIN, EXTERNAL, GSSAPI, PLAIN, SASL
from amqp.transport import TCPTransport
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/t/unit/test_platform.py
new/amqp-2.3.2/t/unit/test_platform.py
--- old/amqp-2.3.0/t/unit/test_platform.py 2018-03-08 14:44:43.000000000
+0100
+++ new/amqp-2.3.2/t/unit/test_platform.py 2018-05-28 15:36:39.000000000
+0200
@@ -13,7 +13,7 @@
import importlib
importlib.reload(module)
except Exception:
- reload(module) # noqa -- does not exist on Python3
+ reload(module) # noqa -- does not exist on Python3
def test_struct_argument_type():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/amqp-2.3.0/t/unit/test_utils.py
new/amqp-2.3.2/t/unit/test_utils.py
--- old/amqp-2.3.0/t/unit/test_utils.py 2018-03-08 14:44:43.000000000 +0100
+++ new/amqp-2.3.2/t/unit/test_utils.py 2018-05-28 15:36:39.000000000 +0200
@@ -41,20 +41,20 @@
class test_str_to_bytes:
def test_from_unicode(self):
- assert isinstance(str_to_bytes('foo'), bytes)
+ assert isinstance(str_to_bytes(u'foo'), bytes)
def test_from_bytes(self):
assert isinstance(str_to_bytes(b'foo'), bytes)
def test_supports_surrogates(self):
bytes_with_surrogates = '\ud83d\ude4f'.encode('utf-8', 'surrogatepass')
- assert str_to_bytes('\ud83d\ude4f') == bytes_with_surrogates
+ assert str_to_bytes(u'\ud83d\ude4f') == bytes_with_surrogates
class test_bytes_to_str:
def test_from_unicode(self):
- assert isinstance(bytes_to_str('foo'), text_t)
+ assert isinstance(bytes_to_str(u'foo'), text_t)
def test_from_bytes(self):
assert bytes_to_str(b'foo')
