Hello community,

here is the log from the commit of package python-kombu for openSUSE:Factory 
checked in at 2013-03-18 07:10:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-kombu (Old)
 and      /work/SRC/openSUSE:Factory/.python-kombu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-kombu", Maintainer is "radma...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-kombu/python-kombu.changes        
2013-02-13 12:10:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-kombu.new/python-kombu.changes   
2013-03-18 07:10:54.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Mar  8 13:10:29 UTC 2013 - alexan...@exatati.com.br
+
+- Update to 2.5.7:
+  - Now depends on amqp 1.0.9
+  - Redis: A regression in 2.5.6 caused the redis transport to
+    ignore options set in transport_options.
+  - Redis: New socket_timeout transport option.
+  - Redis: InconsistencyError is now regarded as a recoverable error.
+  - Resource pools: Will no longer attempt to release resource
+    that was never acquired.
+  - MongoDB: Now supports the ssl option.
+    Contributed by Sebastian Pawlus.
+
+-------------------------------------------------------------------
python3-kombu.changes: same change

Old:
----
  kombu-2.5.6.tar.gz

New:
----
  kombu-2.5.7.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-kombu.spec ++++++
--- /var/tmp/diff_new_pack.gSUO8Q/_old  2013-03-18 07:10:55.000000000 +0100
+++ /var/tmp/diff_new_pack.gSUO8Q/_new  2013-03-18 07:10:55.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           python-kombu
-Version:        2.5.6
+Version:        2.5.7
 Release:        0
 Summary:        AMQP Messaging Framework for Python
 License:        BSD-3-Clause

++++++ python3-kombu.spec ++++++
--- /var/tmp/diff_new_pack.gSUO8Q/_old  2013-03-18 07:10:55.000000000 +0100
+++ /var/tmp/diff_new_pack.gSUO8Q/_new  2013-03-18 07:10:55.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           python3-kombu
-Version:        2.5.6
+Version:        2.5.7
 Release:        0
 Summary:        AMQP Messaging Framework for Python
 License:        BSD-2-Clause

++++++ accept-newer-amqp-versions.diff ++++++
--- /var/tmp/diff_new_pack.gSUO8Q/_old  2013-03-18 07:10:55.000000000 +0100
+++ /var/tmp/diff_new_pack.gSUO8Q/_new  2013-03-18 07:10:55.000000000 +0100
@@ -1,24 +1,30 @@
---- kombu.egg-info/requires.txt
+Index: kombu.egg-info/requires.txt
+===================================================================
+--- kombu.egg-info/requires.txt.orig
 +++ kombu.egg-info/requires.txt
 @@ -1,2 +1,2 @@
  anyjson>=0.3.3
--amqp>=1.0.8,<1.1.0
-\ Kein Zeilenumbruch am Dateiende.
-+amqp>=1.0.8
---- requirements/default.txt
+-amqp>=1.0.9,<1.1.0
+\ No newline at end of file
++amqp>=1.0.9
+Index: requirements/default.txt
+===================================================================
+--- requirements/default.txt.orig
 +++ requirements/default.txt
 @@ -1,2 +1,2 @@
  anyjson>=0.3.3
--amqp>=1.0.8,<1.1.0
-+amqp>=1.0.8
---- setup.cfg
+-amqp>=1.0.9,<1.1.0
++amqp>=1.0.9
+Index: setup.cfg
+===================================================================
+--- setup.cfg.orig
 +++ setup.cfg
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ upload-dir = docs/.build/html
  
  [bdist_rpm]
  requires = anyjson >= 0.3.3
 -      amqp < 1.1.0
-+      amqp >= 1.0.8
++      amqp >= 1.0.9
        importlib
        ordereddict
  

++++++ kombu-2.5.6.tar.gz -> kombu-2.5.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/Changelog new/kombu-2.5.7/Changelog
--- old/kombu-2.5.6/Changelog   2013-02-08 14:00:00.000000000 +0100
+++ new/kombu-2.5.7/Changelog   2013-03-08 13:47:47.000000000 +0100
@@ -4,6 +4,28 @@
  Change history
 ================
 
+.. _version-2.5.7:
+
+2.5.7
+=====
+:release-date: 2013-03-08 01:00 P.M UTC
+
+- Now depends on amqp 1.0.9
+
+- Redis: A regression in 2.5.6 caused the redis transport to
+  ignore options set in ``transport_options``.
+
+- Redis: New ``socket_timeout`` transport option.
+
+- Redis: ``InconsistencyError`` is now regarded as a recoverable error.
+
+- Resource pools: Will no longer attempt to release resource
+  that was never acquired.
+
+- MongoDB: Now supports the ``ssl`` option.
+
+    Contributed by Sebastian Pawlus.
+
 .. _version-2.5.6:
 
 2.5.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/PKG-INFO new/kombu-2.5.7/PKG-INFO
--- old/kombu-2.5.6/PKG-INFO    2013-02-08 18:55:36.000000000 +0100
+++ new/kombu-2.5.7/PKG-INFO    2013-03-08 13:49:29.000000000 +0100
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: kombu
-Version: 2.5.6
+Version: 2.5.7
 Summary: Messaging Framework for Python
 Home-page: http://kombu.readthedocs.org
 Author: Ask Solem
@@ -10,7 +10,7 @@
          kombu - Messaging Framework for Python
         ========================================
         
-        :Version: 2.5.6
+        :Version: 2.5.7
         
         `Kombu` is a messaging framework for Python.
         
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/README new/kombu-2.5.7/README
--- old/kombu-2.5.6/README      2013-02-08 13:29:58.000000000 +0100
+++ new/kombu-2.5.7/README      2013-03-08 13:48:48.000000000 +0100
@@ -2,7 +2,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.6
+:Version: 2.5.7
 
 `Kombu` is a messaging framework for Python.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/README.rst new/kombu-2.5.7/README.rst
--- old/kombu-2.5.6/README.rst  2013-02-08 13:29:58.000000000 +0100
+++ new/kombu-2.5.7/README.rst  2013-03-08 13:48:48.000000000 +0100
@@ -2,7 +2,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.6
+:Version: 2.5.7
 
 `Kombu` is a messaging framework for Python.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/docs/changelog.rst 
new/kombu-2.5.7/docs/changelog.rst
--- old/kombu-2.5.6/docs/changelog.rst  2013-02-08 14:00:00.000000000 +0100
+++ new/kombu-2.5.7/docs/changelog.rst  2013-03-08 13:47:47.000000000 +0100
@@ -4,6 +4,28 @@
  Change history
 ================
 
+.. _version-2.5.7:
+
+2.5.7
+=====
+:release-date: 2013-03-08 01:00 P.M UTC
+
+- Now depends on amqp 1.0.9
+
+- Redis: A regression in 2.5.6 caused the redis transport to
+  ignore options set in ``transport_options``.
+
+- Redis: New ``socket_timeout`` transport option.
+
+- Redis: ``InconsistencyError`` is now regarded as a recoverable error.
+
+- Resource pools: Will no longer attempt to release resource
+  that was never acquired.
+
+- MongoDB: Now supports the ``ssl`` option.
+
+    Contributed by Sebastian Pawlus.
+
 .. _version-2.5.6:
 
 2.5.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/docs/introduction.rst 
new/kombu-2.5.7/docs/introduction.rst
--- old/kombu-2.5.6/docs/introduction.rst       2013-02-08 13:29:58.000000000 
+0100
+++ new/kombu-2.5.7/docs/introduction.rst       2013-03-08 13:48:48.000000000 
+0100
@@ -2,7 +2,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.6
+:Version: 2.5.7
 
 `Kombu` is a messaging framework for Python.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu/__init__.py 
new/kombu-2.5.7/kombu/__init__.py
--- old/kombu-2.5.6/kombu/__init__.py   2013-02-08 13:29:58.000000000 +0100
+++ new/kombu-2.5.7/kombu/__init__.py   2013-03-08 13:47:50.000000000 +0100
@@ -1,7 +1,7 @@
 """Messaging Framework for Python"""
 from __future__ import absolute_import
 
-VERSION = (2, 5, 6)
+VERSION = (2, 5, 7)
 __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
 __author__ = 'Ask Solem'
 __contact__ = 'a...@celeryproject.org'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu/connection.py 
new/kombu-2.5.7/kombu/connection.py
--- old/kombu-2.5.6/kombu/connection.py 2013-02-07 22:43:51.000000000 +0100
+++ new/kombu-2.5.7/kombu/connection.py 2013-03-08 13:42:37.000000000 +0100
@@ -25,6 +25,7 @@
 from .transport import get_transport_cls, supports_librabbitmq
 from .utils import cached_property, retry_over_time, shufflecycle
 from .utils.compat import OrderedDict, LifoQueue as _LifoQueue, next
+from .utils.functional import promise
 from .utils.url import parse_url
 
 __all__ = ['Connection', 'ConnectionPool', 'ChannelPool']
@@ -857,7 +858,12 @@
                     try:
                         R = self.prepare(R)
                     except BaseException:
-                        self.release(R)
+                        if isinstance(R, promise):
+                            # no evaluated yet, just put it back
+                            self._resource.put_nowait(R)
+                        else:
+                            # evaluted so must try to release/close first.
+                            self.release(R)
                         raise
                     self._dirty.add(R)
                     break
@@ -996,7 +1002,7 @@
                     conn = self.new()
                     conn.connect()
                 else:
-                    conn = self.new
+                    conn = promise(self.new)
                 self._resource.put_nowait(conn)
 
     def prepare(self, resource):
@@ -1015,14 +1021,14 @@
                                           preload=preload)
 
     def new(self):
-        return self.connection.channel
+        return promise(self.connection.channel)
 
     def setup(self):
         channel = self.new()
         if self.limit:
             for i in xrange(self.limit):
                 self._resource.put_nowait(
-                    i < self.preload and channel() or channel)
+                    i < self.preload and channel() or promise(channel))
 
     def prepare(self, channel):
         if callable(channel):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu/pools.py 
new/kombu-2.5.7/kombu/pools.py
--- old/kombu-2.5.6/kombu/pools.py      2013-02-07 22:43:51.000000000 +0100
+++ new/kombu-2.5.7/kombu/pools.py      2013-03-08 13:42:37.000000000 +0100
@@ -14,6 +14,7 @@
 from .connection import Resource
 from .messaging import Producer
 from .utils import EqualityDict
+from .utils.functional import promise
 
 __all__ = ['ProducerPool', 'PoolGroup', 'register_group',
            'connections', 'producers', 'get_limit', 'set_limit', 'reset']
@@ -44,7 +45,7 @@
             raise
 
     def new(self):
-        return lambda: self.create_producer()
+        return promise(self.create_producer)
 
     def setup(self):
         if self.limit:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu/transport/mongodb.py 
new/kombu-2.5.7/kombu/transport/mongodb.py
--- old/kombu-2.5.6/kombu/transport/mongodb.py  2013-02-07 22:43:51.000000000 
+0100
+++ new/kombu-2.5.7/kombu/transport/mongodb.py  2013-03-08 13:42:57.000000000 
+0100
@@ -133,7 +133,7 @@
         #
         #   mongodb://[username:password@]host1[:port1][,host2[:port2],
         #   ...[,hostN[:portN]]][/[?options]]
-        mongoconn = Connection(host=hostname)
+        mongoconn = Connection(host=hostname, ssl=conninfo.ssl)
         version = mongoconn.server_info()['version']
         if tuple(map(int, version.split('.')[:2])) < (1, 3):
             raise NotImplementedError(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu/transport/redis.py 
new/kombu-2.5.7/kombu/transport/redis.py
--- old/kombu-2.5.6/kombu/transport/redis.py    2013-02-07 22:43:51.000000000 
+0100
+++ new/kombu-2.5.7/kombu/transport/redis.py    2013-03-08 13:46:07.000000000 
+0100
@@ -8,6 +8,8 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
+import socket
+
 from bisect import bisect
 from contextlib import contextmanager
 from time import time
@@ -319,6 +321,7 @@
     unacked_restore_limit = None
     visibility_timeout = 3600   # 1 hour
     priority_steps = PRIORITY_STEPS
+    socket_timeout = None
     max_connections = 10
     _pool = None
 
@@ -330,8 +333,9 @@
          'unacked_mutex_expire',
          'visibility_timeout',
          'unacked_restore_limit',
+         'socket_timeout',
          'max_connections',
-         'priority_steps'),
+         'priority_steps')  # <-- do not add comma here!
     )
 
     def __init__(self, *args, **kwargs):
@@ -614,7 +618,8 @@
                 'port': conninfo.port or DEFAULT_PORT,
                 'db': database,
                 'password': conninfo.password,
-                'max_connections': self.max_connections}
+                'max_connections': self.max_connections,
+                'socket_timeout': self.socket_timeout}
 
     def _create_client(self):
         return self.Client(connection_pool=self.pool)
@@ -776,6 +781,8 @@
         else:
             DataError = exceptions.DataError
         return ((StdConnectionError,
+                 InconsistencyError,
+                 socket.timeout,
                  exceptions.ConnectionError,
                  exceptions.AuthenticationError),
                 (DataError,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu.egg-info/PKG-INFO 
new/kombu-2.5.7/kombu.egg-info/PKG-INFO
--- old/kombu-2.5.6/kombu.egg-info/PKG-INFO     2013-02-08 18:55:29.000000000 
+0100
+++ new/kombu-2.5.7/kombu.egg-info/PKG-INFO     2013-03-08 13:49:22.000000000 
+0100
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: kombu
-Version: 2.5.6
+Version: 2.5.7
 Summary: Messaging Framework for Python
 Home-page: http://kombu.readthedocs.org
 Author: Ask Solem
@@ -10,7 +10,7 @@
          kombu - Messaging Framework for Python
         ========================================
         
-        :Version: 2.5.6
+        :Version: 2.5.7
         
         `Kombu` is a messaging framework for Python.
         
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/kombu.egg-info/requires.txt 
new/kombu-2.5.7/kombu.egg-info/requires.txt
--- old/kombu-2.5.6/kombu.egg-info/requires.txt 2013-02-08 18:55:29.000000000 
+0100
+++ new/kombu-2.5.7/kombu.egg-info/requires.txt 2013-03-08 13:49:22.000000000 
+0100
@@ -1,2 +1,2 @@
 anyjson>=0.3.3
-amqp>=1.0.8,<1.1.0
\ No newline at end of file
+amqp>=1.0.9,<1.1.0
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.6/requirements/default.txt 
new/kombu-2.5.7/requirements/default.txt
--- old/kombu-2.5.6/requirements/default.txt    2013-02-08 13:59:34.000000000 
+0100
+++ new/kombu-2.5.7/requirements/default.txt    2013-03-08 13:42:37.000000000 
+0100
@@ -1,2 +1,2 @@
 anyjson>=0.3.3
-amqp>=1.0.8,<1.1.0
+amqp>=1.0.9,<1.1.0

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to