Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-oslo.cache for openSUSE:Factory checked in at 2023-03-07 16:49:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.cache (Old) and /work/SRC/openSUSE:Factory/.python-oslo.cache.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.cache" Tue Mar 7 16:49:46 2023 rev:16 rq:1069829 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.cache/python-oslo.cache.changes 2022-06-07 11:45:45.535282048 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.cache.new.31432/python-oslo.cache.changes 2023-03-07 16:50:21.725593335 +0100 @@ -1,0 +2,28 @@ +Tue Mar 7 06:52:28 UTC 2023 - cloud-de...@suse.de + +- update to version 3.3.1 + - Fix issues related to tox4 + +------------------------------------------------------------------- +Mon Mar 6 15:24:27 UTC 2023 - cloud-de...@suse.de + +- update to version 3.3.0 + - Add Python3 antelope unit tests + - Imported Translations from Zanata + - Add bmemcached as optional dependency + - Update master for stable/zed + +------------------------------------------------------------------- +Sun Oct 2 14:47:23 UTC 2022 - cloud-de...@suse.de + +- update to version 3.1.0 + - Support SASL protocol for memcached + +------------------------------------------------------------------- +Tue Aug 16 08:43:11 UTC 2022 - cloud-de...@suse.de + +- update to version 3.0.0 + - Drop python3.6/3.7 support in testing runtime + - Imported Translations from Zanata + +------------------------------------------------------------------- Old: ---- oslo.cache-2.11.0.tar.gz New: ---- oslo.cache-3.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.cache.spec ++++++ --- /var/tmp/diff_new_pack.M0H66m/_old 2023-03-07 16:50:22.385596809 +0100 +++ /var/tmp/diff_new_pack.M0H66m/_new 2023-03-07 16:50:22.393596851 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-oslo.cache # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python-oslo.cache -Version: 2.11.0 +Version: 3.3.1 Release: 0 Summary: Cache storage for Openstack projects License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/oslo.cache -Source0: https://files.pythonhosted.org/packages/source/o/oslo.cache/oslo.cache-2.11.0.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.cache/oslo.cache-3.3.1.tar.gz BuildRequires: openstack-macros BuildRequires: python3-dogpile.cache >= 1.1.5 BuildRequires: python3-oslo.config >= 8.1.0 @@ -34,6 +34,7 @@ BuildRequires: python3-pbr BuildRequires: python3-pymemcache BuildRequires: python3-pymongo +BuildRequires: python3-python-binary-memcached BuildRequires: python3-python-memcached BuildRequires: python3-stestr BuildArch: noarch @@ -69,7 +70,7 @@ Documentation for the OpenStack Oslo cache library. %prep -%autosetup -p1 -n oslo.cache-2.11.0 +%autosetup -p1 -n oslo.cache-3.3.1 %py_req_cleanup %build @@ -79,12 +80,12 @@ %{py3_install} # generate html docs -PBR_VERSION=2.11.0 %sphinx_build -b html doc/source doc/build/html +PBR_VERSION=3.3.1 %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %check -python3 -m stestr.cli run +%{openstack_stestr_run} %files -n python3-oslo.cache %license LICENSE ++++++ oslo.cache-2.11.0.tar.gz -> oslo.cache-3.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/.zuul.yaml new/oslo.cache-3.3.1/.zuul.yaml --- old/oslo.cache-2.11.0/.zuul.yaml 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/.zuul.yaml 2023-02-21 18:24:44.000000000 +0100 @@ -55,7 +55,7 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-python3-zed-jobs + - openstack-python3-antelope-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/AUTHORS new/oslo.cache-3.3.1/AUTHORS --- old/oslo.cache-2.11.0/AUTHORS 2022-04-27 17:31:26.000000000 +0200 +++ new/oslo.cache-3.3.1/AUTHORS 2023-02-21 18:25:10.000000000 +0100 @@ -55,6 +55,7 @@ Nguyen Hai <nguyentriha...@gmail.com> OpenStack Release Bot <infra-r...@openstack.org> Pavel Kholkin <pkhol...@mirantis.com> +Pierre Riteau <pie...@stackhpc.com> RadosÅaw Piliszek <radoslaw.pilis...@gmail.com> Rodolfo Alonso Hernandez <rodolfo.alonso.hernan...@intel.com> Sai Krishna <saikrishna1...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/ChangeLog new/oslo.cache-3.3.1/ChangeLog --- old/oslo.cache-2.11.0/ChangeLog 2022-04-27 17:31:26.000000000 +0200 +++ new/oslo.cache-3.3.1/ChangeLog 2023-02-21 18:25:10.000000000 +0100 @@ -1,6 +1,30 @@ CHANGES ======= +3.3.1 +----- + +* Fix issues related to tox4 + +3.3.0 +----- + +* Imported Translations from Zanata +* Add Python3 antelope unit tests +* Update master for stable/zed +* Add bmemcached as optional dependency + +3.1.0 +----- + + +3.0.0 +----- + +* Imported Translations from Zanata +* Drop python3.6/3.7 support in testing runtime +* Support SASL protocol for memcached + 2.11.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/PKG-INFO new/oslo.cache-3.3.1/PKG-INFO --- old/oslo.cache-2.11.0/PKG-INFO 2022-04-27 17:31:26.557113000 +0200 +++ new/oslo.cache-3.3.1/PKG-INFO 2023-02-21 18:25:10.796510500 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.cache -Version: 2.11.0 +Version: 3.3.1 Summary: Cache storage for OpenStack projects. Home-page: https://docs.openstack.org/oslo.cache/latest Author: OpenStack @@ -51,11 +51,9 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.6 -Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 -Requires-Python: >=3.6 +Requires-Python: >=3.8 Provides-Extra: dogpile Provides-Extra: etcd3gw Provides-Extra: mongo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo.cache.egg-info/PKG-INFO new/oslo.cache-3.3.1/oslo.cache.egg-info/PKG-INFO --- old/oslo.cache-2.11.0/oslo.cache.egg-info/PKG-INFO 2022-04-27 17:31:26.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo.cache.egg-info/PKG-INFO 2023-02-21 18:25:10.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.cache -Version: 2.11.0 +Version: 3.3.1 Summary: Cache storage for OpenStack projects. Home-page: https://docs.openstack.org/oslo.cache/latest Author: OpenStack @@ -51,11 +51,9 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.6 -Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 -Requires-Python: >=3.6 +Requires-Python: >=3.8 Provides-Extra: dogpile Provides-Extra: etcd3gw Provides-Extra: mongo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo.cache.egg-info/SOURCES.txt new/oslo.cache-3.3.1/oslo.cache.egg-info/SOURCES.txt --- old/oslo.cache-2.11.0/oslo.cache.egg-info/SOURCES.txt 2022-04-27 17:31:26.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo.cache.egg-info/SOURCES.txt 2023-02-21 18:25:10.000000000 +0100 @@ -34,6 +34,7 @@ oslo.cache.egg-info/requires.txt oslo.cache.egg-info/top_level.txt oslo_cache/__init__.py +oslo_cache/_bmemcache_pool.py oslo_cache/_i18n.py oslo_cache/_memcache_pool.py oslo_cache/_opts.py @@ -81,6 +82,7 @@ releasenotes/notes/bug-1819957-ccff6b0ec9d1cbf2.yaml releasenotes/notes/bug-1888394-5a53e7a9cb25375b.yaml releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml +releasenotes/notes/enable-sasl-protocol-46d11530b87e7832.yaml releasenotes/notes/etcd3gw_driver-8ba4511ae9553a91.yaml releasenotes/notes/fix-memcache-pool-backend-b9e6aaab08075d68.yaml releasenotes/notes/lower_socket_timeout-ff5680a6be23bdb2.yaml @@ -104,6 +106,7 @@ releasenotes/source/wallaby.rst releasenotes/source/xena.rst releasenotes/source/yoga.rst +releasenotes/source/zed.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder releasenotes/source/locale/de/LC_MESSAGES/releasenotes.po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo.cache.egg-info/pbr.json new/oslo.cache-3.3.1/oslo.cache.egg-info/pbr.json --- old/oslo.cache-2.11.0/oslo.cache.egg-info/pbr.json 2022-04-27 17:31:26.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo.cache.egg-info/pbr.json 2023-02-21 18:25:10.000000000 +0100 @@ -1 +1 @@ -{"git_version": "2d610d0", "is_release": true} \ No newline at end of file +{"git_version": "318e95e", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo.cache.egg-info/requires.txt new/oslo.cache-3.3.1/oslo.cache.egg-info/requires.txt --- old/oslo.cache-2.11.0/oslo.cache.egg-info/requires.txt 2022-04-27 17:31:26.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo.cache.egg-info/requires.txt 2023-02-21 18:25:10.000000000 +0100 @@ -6,6 +6,7 @@ [dogpile] pymemcache>=3.5.0 +python-binary-memcached>=0.29.0 python-memcached>=1.56 [etcd3gw] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/_bmemcache_pool.py new/oslo.cache-3.3.1/oslo_cache/_bmemcache_pool.py --- old/oslo.cache-2.11.0/oslo_cache/_bmemcache_pool.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.cache-3.3.1/oslo_cache/_bmemcache_pool.py 2023-02-21 18:24:44.000000000 +0100 @@ -0,0 +1,62 @@ +# Copyright 2022 Inspur +# All Rights Reserved. +# +# 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. + +"""Thread-safe connection pool for python-binary-memcached.""" +try: + import eventlet +except ImportError: + eventlet = None +import bmemcached +from oslo_cache._memcache_pool import MemcacheClientPool +from oslo_log import log + +LOG = log.getLogger(__name__) + + +class _BMemcacheClient(bmemcached.Client): + """Thread global memcache client + + As client is inherited from threading.local we have to restore object + methods overloaded by threading.local so we can reuse clients in + different threads + """ + __delattr__ = object.__delattr__ + __getattribute__ = object.__getattribute__ + __setattr__ = object.__setattr__ + + # Hack for lp 1812935 + if eventlet and eventlet.patcher.is_monkey_patched('thread'): + # NOTE(bnemec): I'm not entirely sure why this works in a + # monkey-patched environment and not with vanilla stdlib, but it does. + def __new__(cls, *args, **kwargs): + return object.__new__(cls) + else: + __new__ = object.__new__ + + def __del__(self): + pass + + +class BMemcacheClientPool(MemcacheClientPool): + def __init__(self, urls, arguments, **kwargs): + MemcacheClientPool.__init__(self, urls, arguments, **kwargs) + self._arguments = { + 'username': arguments.get('username', None), + 'password': arguments.get('password', None), + 'tls_context': arguments.get('tls_context', None), + } + + def _create_connection(self): + return _BMemcacheClient(self.urls, **self._arguments) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/_memcache_pool.py new/oslo.cache-3.3.1/oslo_cache/_memcache_pool.py --- old/oslo.cache-2.11.0/oslo_cache/_memcache_pool.py 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/_memcache_pool.py 2023-02-21 18:24:44.000000000 +0100 @@ -204,7 +204,14 @@ # old-style class ConnectionPool.__init__(self, **kwargs) self.urls = urls - self._arguments = arguments + self._arguments = { + 'dead_retry': arguments.get('dead_retry', 5 * 60), + 'socket_timeout': arguments.get('socket_timeout', 3.0), + 'server_max_value_length': + arguments.get('server_max_value_length'), + 'flush_on_reconnect': arguments.get( + 'pool_flush_on_reconnect', False), + } # NOTE(morganfainberg): The host objects expect an int for the # deaduntil value. Initialize this at 0 for each host with 0 indicating # the host is not dead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/_opts.py new/oslo.cache-3.3.1/oslo_cache/_opts.py --- old/oslo.cache-2.11.0/oslo_cache/_opts.py 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/_opts.py 2023-02-21 18:24:44.000000000 +0100 @@ -117,6 +117,16 @@ help='Global toggle if memcache will be flushed' ' on reconnect.' ' (oslo_cache.memcache_pool backend only).'), + cfg.BoolOpt('memcache_sasl_enabled', + default=False, + help='Enable the SASL(Simple Authentication and Security' + 'Layer) if the SASL_enable is true, else disable.'), + cfg.StrOpt('memcache_username', + default='', + help='the user name for the memcached which SASL enabled'), + cfg.StrOpt('memcache_password', + default='', + help='the password for the memcached which SASL enabled'), cfg.BoolOpt('tls_enabled', default=False, help='Global toggle for TLS usage when comunicating with' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/backends/memcache_pool.py new/oslo.cache-3.3.1/oslo_cache/backends/memcache_pool.py --- old/oslo.cache-2.11.0/oslo_cache/backends/memcache_pool.py 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/backends/memcache_pool.py 2023-02-21 18:24:44.000000000 +0100 @@ -19,6 +19,7 @@ from dogpile.cache.backends import memcached as memcached_backend +from oslo_cache import _bmemcache_pool from oslo_cache import _memcache_pool @@ -55,20 +56,24 @@ # Composed from GenericMemcachedBackend's and MemcacheArgs's __init__ def __init__(self, arguments): super(PooledMemcachedBackend, self).__init__(arguments) - self.client_pool = _memcache_pool.MemcacheClientPool( - self.url, - arguments={ - 'dead_retry': arguments.get('dead_retry', 5 * 60), - 'socket_timeout': arguments.get('socket_timeout', 3.0), - 'server_max_value_length': - arguments.get('server_max_value_length'), - 'flush_on_reconnect': arguments.get('pool_flush_on_reconnect', - False), - }, - maxsize=arguments.get('pool_maxsize', 10), - unused_timeout=arguments.get('pool_unused_timeout', 60), - conn_get_timeout=arguments.get('pool_connection_get_timeout', 10), - ) + if arguments.get('sasl_enabled', False): + self.client_pool = _bmemcache_pool.BMemcacheClientPool( + self.url, + arguments, + maxsize=arguments.get('pool_maxsize', 10), + unused_timeout=arguments.get('pool_unused_timeout', 60), + conn_get_timeout=arguments.get('pool_connection_get_timeout', + 10), + ) + else: + self.client_pool = _memcache_pool.MemcacheClientPool( + self.url, + arguments, + maxsize=arguments.get('pool_maxsize', 10), + unused_timeout=arguments.get('pool_unused_timeout', 60), + conn_get_timeout=arguments.get('pool_connection_get_timeout', + 10), + ) # Since all methods in backend just call one of methods of client, this # lets us avoid need to hack it too much diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/core.py new/oslo.cache-3.3.1/oslo_cache/core.py --- old/oslo.cache-2.11.0/oslo_cache/core.py 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/core.py 2023-02-21 18:24:44.000000000 +0100 @@ -163,7 +163,8 @@ conf.cache.memcache_servers) for arg in ('dead_retry', 'socket_timeout', 'pool_maxsize', 'pool_unused_timeout', 'pool_connection_get_timeout', - 'pool_flush_on_reconnect'): + 'pool_flush_on_reconnect', 'sasl_enabled', 'username', + 'password'): value = getattr(conf.cache, 'memcache_' + arg) conf_dict['%s.arguments.%s' % (prefix, arg)] = value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/locale/en_GB/LC_MESSAGES/oslo_cache.po new/oslo.cache-3.3.1/oslo_cache/locale/en_GB/LC_MESSAGES/oslo_cache.po --- old/oslo.cache-2.11.0/oslo_cache/locale/en_GB/LC_MESSAGES/oslo_cache.po 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/locale/en_GB/LC_MESSAGES/oslo_cache.po 2023-02-21 18:24:44.000000000 +0100 @@ -1,13 +1,14 @@ # Andi Chandler <a...@gowling.com>, 2016. #zanata +# Andi Chandler <a...@gowling.com>, 2022. #zanata msgid "" msgstr "" "Project-Id-Version: oslo.cache VERSION\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" -"POT-Creation-Date: 2018-02-08 23:08+0000\n" +"POT-Creation-Date: 2022-05-11 15:54+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-06-28 05:53+0000\n" +"PO-Revision-Date: 2022-06-13 07:43+0000\n" "Last-Translator: Andi Chandler <a...@gowling.com>\n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -22,6 +23,16 @@ "Invalid ssl_cert_reqs value of %s, must be one of \"NONE\", \"OPTIONAL\", " "\"REQUIRED\"" +msgid "" +"Retry client is only supported by the 'dogpile.cache.pymemcache' backend." +msgstr "" +"Retry client is only supported by the 'dogpile.cache.pymemcache' backend." + +msgid "" +"Socket keepalive is only supported by the 'dogpile.cache.pymemcache' backend." +msgstr "" +"Socket keepalive is only supported by the 'dogpile.cache.pymemcache' backend." + #, python-format msgid "" "Unable to get a connection from pool id %(id)s after %(seconds)s seconds." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/tests/functional/memcache_pool/test_cache_backend.py new/oslo.cache-3.3.1/oslo_cache/tests/functional/memcache_pool/test_cache_backend.py --- old/oslo.cache-2.11.0/oslo_cache/tests/functional/memcache_pool/test_cache_backend.py 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/tests/functional/memcache_pool/test_cache_backend.py 2023-02-21 18:24:44.000000000 +0100 @@ -30,3 +30,20 @@ # config fixture is properly initialized with value related to # the current backend in use. super(TestMemcachePoolCacheBackend, self).setUp() + + +class TestBMemcachePoolCacheBackend(test_base.BaseTestCaseCacheBackend): + def setUp(self): + MEMCACHED_PORT = os.getenv("OSLO_CACHE_TEST_MEMCACHED_PORT", "11211") + # If the cache support the sasl, the memcache_sasl_enabled + # should be True. + self.config_fixture.config( + group='cache', + backend='oslo_cache.memcache_pool', + enabled=True, + memcache_servers=[f'localhost:{MEMCACHED_PORT}'], + memcache_sasl_enabled=False, + memcache_username='sasl_name', + memcache_password='sasl_pswd' + ) + super(TestBMemcachePoolCacheBackend, self).setUp() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/oslo_cache/tests/unit/test_connection_pool.py new/oslo.cache-3.3.1/oslo_cache/tests/unit/test_connection_pool.py --- old/oslo.cache-2.11.0/oslo_cache/tests/unit/test_connection_pool.py 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/oslo_cache/tests/unit/test_connection_pool.py 2023-02-21 18:24:44.000000000 +0100 @@ -18,6 +18,7 @@ import testtools from testtools import matchers +from oslo_cache import _bmemcache_pool from oslo_cache import _memcache_pool from oslo_cache import exception from oslo_cache.tests import test_cache @@ -161,3 +162,13 @@ self.assertFalse(client.do_check_key) # Make sure our __new__ override still results in the right type self.assertIsInstance(client, _memcache_pool._MemcacheClient) + + +class TestBMemcacheClient(test_cache.BaseTestCase): + + def test_can_create_with_kwargs(self): + client = _bmemcache_pool._BMemcacheClient('foo', password='123456') + # Make sure kwargs are properly processed by the client + self.assertEqual('123456', client.password) + # Make sure our __new__ override still results in the right type + self.assertIsInstance(client, _bmemcache_pool._BMemcacheClient) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/releasenotes/notes/enable-sasl-protocol-46d11530b87e7832.yaml new/oslo.cache-3.3.1/releasenotes/notes/enable-sasl-protocol-46d11530b87e7832.yaml --- old/oslo.cache-2.11.0/releasenotes/notes/enable-sasl-protocol-46d11530b87e7832.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.cache-3.3.1/releasenotes/notes/enable-sasl-protocol-46d11530b87e7832.yaml 2023-02-21 18:24:44.000000000 +0100 @@ -0,0 +1,5 @@ +--- +features: + - | + Add the feature to support SASL for olso.cache to improve the security + of authority. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/releasenotes/source/index.rst new/oslo.cache-3.3.1/releasenotes/source/index.rst --- old/oslo.cache-2.11.0/releasenotes/source/index.rst 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/releasenotes/source/index.rst 2023-02-21 18:24:44.000000000 +0100 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + zed yoga xena wallaby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po new/oslo.cache-3.3.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po --- old/oslo.cache-2.11.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2023-02-21 18:24:44.000000000 +0100 @@ -3,15 +3,16 @@ # Andi Chandler <a...@gowling.com>, 2018. #zanata # Andi Chandler <a...@gowling.com>, 2019. #zanata # Andi Chandler <a...@gowling.com>, 2020. #zanata +# Andi Chandler <a...@gowling.com>, 2022. #zanata msgid "" msgstr "" "Project-Id-Version: oslo.cache Release Notes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-14 16:49+0000\n" +"POT-Creation-Date: 2022-09-09 16:01+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2020-10-03 10:32+0000\n" +"PO-Revision-Date: 2022-09-05 10:56+0000\n" "Last-Translator: Andi Chandler <a...@gowling.com>\n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -21,8 +22,8 @@ msgid "1.22.0" msgstr "1.22.0" -msgid "1.28.1-1" -msgstr "1.28.1-1" +msgid "1.28.1-2" +msgstr "1.28.1-2" msgid "1.30.0" msgstr "1.30.0" @@ -45,6 +46,12 @@ msgid "1.37.0" msgstr "1.37.0" +msgid "1.37.1" +msgstr "1.37.1" + +msgid "1.37.1-4" +msgstr "1.37.1-4" + msgid "1.9.0" msgstr "1.9.0" @@ -54,23 +61,96 @@ msgid "2.1.0" msgstr "2.1.0" +msgid "2.10.0" +msgstr "2.10.0" + msgid "2.2.0" msgstr "2.2.0" +msgid "2.3.1" +msgstr "2.3.1" + +msgid "2.3.1-4" +msgstr "2.3.1-4" + +msgid "2.6.2" +msgstr "2.6.2" + +msgid "2.6.3" +msgstr "2.6.3" + +msgid "2.7.0" +msgstr "2.7.0" + +msgid "2.7.1" +msgstr "2.7.1" + +msgid "2.8.2" +msgstr "2.8.2" + +msgid "3.1.0" +msgstr "3.1.0" + msgid "@param flush_on_reconnect: optional flag which prevents a" msgstr "@param flush_on_reconnect: optional flag which prevents a" msgid "" +"Add new options (``enable_retry_client``, ``retry_attempts``, " +"``retry_delay``) to add retry mechanisms to the pymemcache backend." +msgstr "" +"Add new options (``enable_retry_client``, ``retry_attempts``, " +"``retry_delay``) to add retry mechanisms to the pymemcache backend." + +msgid "" +"Add new options (``hashclient_retry_attempts``, ``hashclient_retry_delay``, " +"``dead_timeout``) to allow to configure pymemcache's HashClient use through " +"dogpile.cache's pymemcache backend. Those options expose pymemcache params " +"that allow to configure the failover for memcached cluster." +msgstr "" +"Add new options (``hashclient_retry_attempts``, ``hashclient_retry_delay``, " +"``dead_timeout``) to allow to configure pymemcache's HashClient use through " +"dogpile.cache's pymemcache backend. Those options expose pymemcache params " +"that allow configuring the failover for memcached cluster." + +msgid "" +"Add the feature to support SASL for olso.cache to improve the security of " +"authority." +msgstr "" +"Add the feature to support SASL for olso.cache to improve the security of " +"authority." + +msgid "" "Added a new etcd3gw driver that uses the etcd 3.x grpc-gateway HTTP \"/" "v3alpha\" API to cache key/value pairs." msgstr "" "Added a new etcd3gw driver that uses the etcd 3.x grpc-gateway HTTP \"/" "v3alpha\" API to cache key/value pairs." +msgid "" +"Added a new memcached driver that uses pymemcache through dogpile.cache." +msgstr "" +"Added a new memcached driver that uses pymemcache through dogpile.cache." + msgid "Bug Fixes" msgstr "Bug Fixes" msgid "" +"But unfortunatelly this option is causing another issue. If memcache server " +"disappears, or client had broken connection to memcache server, clients " +"start to flush server on reconnect." +msgstr "" +"But unfortunately, this option is causing another issue. If memcache server " +"disappears, or the client had a broken connection to memcache server, the " +"clients start to flush the server on reconnect." + +msgid "" +"Configuration option ``memcache_pool_flush_on_reconnect`` added to control " +"if flush will be sent to memcached server after reconnect." +msgstr "" +"Configuration option ``memcache_pool_flush_on_reconnect`` added to control " +"if flush will be sent to memcached server after reconnect." + +msgid "" "Fix the memcache_pool backend broken in oslo.cache's version 2.1.0 by " "switching from a python-memcache based client to a pymemcache based client. " "Reintroducing the client based on python-memcached as the default client for " @@ -81,9 +161,25 @@ "Reintroducing the client based on python-memcached as the default client for " "the memcache_pool dogpile backend." +msgid "" +"If willing to use this driver, make sure you have both dogpile.cache>=1.1.2 " +"and pymemcache>=3.4.0 installed." +msgstr "" +"If willing to use this driver, make sure you have both dogpile.cache>=1.1.2 " +"and pymemcache>=3.4.0 installed." + msgid "New Features" msgstr "New Features" +msgid "" +"New options (``enable_socket_keepalive``, ``socket_keepalive_idle``, " +"``socket_keepalive_interval``, ``socket_keepalive_count``) allow to use and " +"configure pymemcache's socket keepalive capabilities." +msgstr "" +"New options (``enable_socket_keepalive``, ``socket_keepalive_idle``, " +"``socket_keepalive_interval``, ``socket_keepalive_count``) allow to use and " +"configure pymemcache's socket keepalive capabilities." + msgid "Newton Series Release Notes" msgstr "Newton Series Release Notes" @@ -112,6 +208,15 @@ msgid "See the help from python-memcached:" msgstr "See the help from python-memcached:" +msgid "" +"Simply said this option can cause loop of flushs and overloaded memcached " +"servers. This change is moving optional parameter `flush_on_reconnect` to " +"oslo.cache config." +msgstr "" +"Simply said this option can cause loop of flushs and overloaded memcached " +"servers. This change is moving the optional parameter `flush_on_reconnect` " +"to oslo.cache config." + msgid "Stein Series Release Notes" msgstr "Stein Series Release Notes" @@ -140,6 +245,13 @@ "pull/1429>`_. If you deployment relies explicitly on a timeout of 3 seconds, " "please set that override in your configuration." +msgid "" +"This means that network connections will go UP and can cause server to be " +"overloaded until memcache will be unresponsive." +msgstr "" +"This means that network connections will go UP and can cause the server to " +"be overloaded until memcache will become unresponsive." + msgid "Train Series Release Notes" msgstr "Train Series Release Notes" @@ -155,6 +267,15 @@ msgid "Victoria Series Release Notes" msgstr "Victoria Series Release Notes" +msgid "Wallaby Series Release Notes" +msgstr "Wallaby Series Release Notes" + +msgid "Xena Series Release Notes" +msgstr "Xena Series Release Notes" + +msgid "Yoga Series Release Notes" +msgstr "Yoga Series Release Notes" + msgid "" "[`bug 1743036 <https://bugs.launchpad.net/oslo.cache+bug/1743036>`_] The " "`backend_argument` value(s) for `url` when configuring memcache did not " @@ -194,6 +315,19 @@ "problem and is the recommended production configuration." msgid "" +"[`bug 1888394 <https://bugs.launchpad.net/oslo.cache/+bug/1888394>`_] If a " +"memcache server disappears and then reconnects when multiple memcache " +"servers are used (specific to the python-memcached based backends) it is " +"possible that the server will contain stale data. To avoid this, param " +"flush_on_reconnect was used in code." +msgstr "" +"[`bug 1888394 <https://bugs.launchpad.net/oslo.cache/+bug/1888394>`_] If a " +"memcache server disappears and then reconnects when multiple memcache " +"servers are used (specific to the python-memcached based backends) it is " +"possible that the server will contain stale data. To avoid this, param " +"flush_on_reconnect was used in the code." + +msgid "" "`memcache_socket_timeout` is changed to float, given the same default value " "'3.0'." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/releasenotes/source/zed.rst new/oslo.cache-3.3.1/releasenotes/source/zed.rst --- old/oslo.cache-2.11.0/releasenotes/source/zed.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.cache-3.3.1/releasenotes/source/zed.rst 2023-02-21 18:24:44.000000000 +0100 @@ -0,0 +1,6 @@ +======================== +Zed Series Release Notes +======================== + +.. release-notes:: + :branch: stable/zed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/setup.cfg new/oslo.cache-3.3.1/setup.cfg --- old/oslo.cache-2.11.0/setup.cfg 2022-04-27 17:31:26.557113000 +0200 +++ new/oslo.cache-3.3.1/setup.cfg 2023-02-21 18:25:10.796510500 +0100 @@ -6,7 +6,7 @@ author = OpenStack author_email = openstack-disc...@lists.openstack.org home_page = https://docs.openstack.org/oslo.cache/latest -python_requires = >=3.6 +python_requires = >=3.8 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -16,8 +16,6 @@ Programming Language :: Python Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 @@ -38,6 +36,7 @@ dogpile = python-memcached>=1.56 # PSF pymemcache>=3.5.0 # Apache-2.0 + python-binary-memcached>=0.29.0 # MIT mongo = pymongo!=3.1,>=3.0.2 # Apache-2.0 etcd3gw = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.cache-2.11.0/tox.ini new/oslo.cache-3.3.1/tox.ini --- old/oslo.cache-2.11.0/tox.ini 2022-04-27 17:30:55.000000000 +0200 +++ new/oslo.cache-3.3.1/tox.ini 2023-02-21 18:24:44.000000000 +0100 @@ -1,11 +1,9 @@ [tox] minversion = 3.2.0 envlist = py3,pep8 -ignore_basepython_conflict = True [testenv] -basepython = python3 -whitelist_externals = +allowlist_externals = find deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -32,7 +30,7 @@ commands = {posargs} [testenv:docs] -whitelist_externals = rm +allowlist_externals = rm deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt @@ -59,7 +57,7 @@ import_exceptions = [testenv:releasenotes] -whitelist_externals = +allowlist_externals = rm deps = {[testenv:docs]deps} commands =