Bug#986199: unblock: python-oslo.cache/2.6.2-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package python-oslo.cache
This new release adds support for pymemcache, which was by
the way already available in the relevant backend driver,
here, dogpile.cache.
The relevant part of upstream code is just this:
+if dogpile.__version__ >= '1.1.2':
+ _backend_choices.append('dogpile.cache.pymemcache')
the rest of the debdiff is just distraction.
Please unblock python-oslo.cache/2.6.2-1.
Cheers,
Thomas Goirand (zigo)
diff -Nru python-oslo.cache-2.6.1/debian/changelog python-oslo.cache-2.6.2/debian/changelog
--- python-oslo.cache-2.6.1/debian/changelog 2020-10-15 23:00:34.000000000 +0200
+++ python-oslo.cache-2.6.2/debian/changelog 2021-03-31 13:34:14.000000000 +0200
@@ -1,3 +1,9 @@
+python-oslo.cache (2.6.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org> Wed, 31 Mar 2021 13:34:14 +0200
+
python-oslo.cache (2.6.1-2) unstable; urgency=medium
* Uploading to unstable.
diff -Nru python-oslo.cache-2.6.1/.gitreview python-oslo.cache-2.6.2/.gitreview
--- python-oslo.cache-2.6.1/.gitreview 2020-08-25 14:01:17.000000000 +0200
+++ python-oslo.cache-2.6.2/.gitreview 2021-02-09 14:18:20.000000000 +0100
@@ -2,3 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/oslo.cache.git
+defaultbranch=stable/victoria
diff -Nru python-oslo.cache-2.6.1/lower-constraints.txt python-oslo.cache-2.6.2/lower-constraints.txt
--- python-oslo.cache-2.6.1/lower-constraints.txt 2020-08-25 14:01:17.000000000 +0200
+++ python-oslo.cache-2.6.2/lower-constraints.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-appdirs==1.4.3
-certifi==2018.1.18
-cffi==1.13.1
-chardet==3.0.4
-cliff==3.1.0
-cmd2==0.8.9
-debtcollector==2.1.0
-decorator==4.4.2
-dogpile.cache==1.0.2
-entrypoints==0.3
-etcd3gw==0.2.0
-extras==1.0.0
-fixtures==3.0.0
-future==0.18.2
-futurist==2.2.0
-gitdb2==2.0.3
-GitPython==2.1.8
-idna==2.6
-iso8601==0.1.12
-keystoneauth1==3.4.0
-linecache2==1.0.0
-mock==4.0.2
-mox3==0.25.0
-msgpack==1.0.0
-netaddr==0.7.19
-netifaces==0.10.9
-os-client-config==1.29.0
-oslo.config==8.1.0
-oslo.context==3.1.0
-oslo.i18n==5.0.0
-oslo.log==4.2.1
-oslo.serialization==3.2.0
-oslo.utils==4.2.0
-oslotest==3.2.0
-pbr==3.1.1
-pifpaf==0.10.0
-prettytable==0.7.2
-pycparser==2.18
-pyinotify==0.9.6
-pymongo==3.0.2
-pyparsing==2.2.0
-pyperclip==1.8.0
-python-binary-memcached==0.29.0
-python-dateutil==2.8.1
-python-memcached==1.56
-python-mimeparse==1.6.0
-python-subunit==1.2.0
-pytz==2020.1
-PyYAML==3.12
-requests==2.18.4
-requestsexceptions==1.4.0
-rfc3986==1.4.0
-six==1.11.0
-smmap2==2.0.3
-stestr==2.0.0
-stevedore==1.28.0
-testrepository==0.0.20
-testtools==2.3.0
-traceback2==1.4.0
-unittest2==1.1.0
-urllib3==1.22
-voluptuous==0.11.7
-wcwidth==0.2.4
-wrapt==1.12.1
-xattr==0.9.3
diff -Nru python-oslo.cache-2.6.1/oslo_cache/_opts.py python-oslo.cache-2.6.2/oslo_cache/_opts.py
--- python-oslo.cache-2.6.1/oslo_cache/_opts.py 2020-08-25 14:01:17.000000000 +0200
+++ python-oslo.cache-2.6.2/oslo_cache/_opts.py 2021-02-09 14:18:20.000000000 +0100
@@ -12,11 +12,34 @@
# License for the specific language governing permissions and limitations
# under the License.
+import dogpile
+
from oslo_config import cfg
_DEFAULT_BACKEND = 'dogpile.cache.null'
+_backend_choices = [
+ 'oslo_cache.memcache_pool',
+ 'oslo_cache.dict',
+ 'oslo_cache.mongo',
+ 'oslo_cache.etcd3gw',
+ 'dogpile.cache.memcached',
+ 'dogpile.cache.pylibmc',
+ 'dogpile.cache.bmemcached',
+ 'dogpile.cache.dbm',
+ 'dogpile.cache.redis',
+ 'dogpile.cache.memory',
+ 'dogpile.cache.memory_pickle',
+ 'dogpile.cache.null'
+]
+
+# NOTE(moguimar): dogpile.cache.pymemcache is currently the best
+# driver for using Memcached with TLS. This backport is intent for
+# security purposes.
+if dogpile.__version__ >= '1.1.2':
+ _backend_choices.append('dogpile.cache.pymemcache')
+
FILE_OPTIONS = {
'cache': [
cfg.StrOpt('config_prefix', default='cache.oslo',
@@ -34,18 +57,7 @@
# prevent issues with the memory cache ending up in "production"
# unintentionally, we register a no-op as the default caching backend.
cfg.StrOpt('backend', default=_DEFAULT_BACKEND,
- choices=['oslo_cache.memcache_pool',
- 'oslo_cache.dict',
- 'oslo_cache.mongo',
- 'oslo_cache.etcd3gw',
- 'dogpile.cache.memcached',
- 'dogpile.cache.pylibmc',
- 'dogpile.cache.bmemcached',
- 'dogpile.cache.dbm',
- 'dogpile.cache.redis',
- 'dogpile.cache.memory',
- 'dogpile.cache.memory_pickle',
- 'dogpile.cache.null'],
+ choices=_backend_choices,
help='Cache backend module. For eventlet-based or '
'environments with hundreds of threaded servers, Memcache '
'with pooling (oslo_cache.memcache_pool) is recommended. '
diff -Nru python-oslo.cache-2.6.1/releasenotes/notes/add-dogpile.cache.pymemcache-backend-627d31a76013f8e1.yaml python-oslo.cache-2.6.2/releasenotes/notes/add-dogpile.cache.pymemcache-backend-627d31a76013f8e1.yaml
--- python-oslo.cache-2.6.1/releasenotes/notes/add-dogpile.cache.pymemcache-backend-627d31a76013f8e1.yaml 1970-01-01 01:00:00.000000000 +0100
+++ python-oslo.cache-2.6.2/releasenotes/notes/add-dogpile.cache.pymemcache-backend-627d31a76013f8e1.yaml 2021-02-09 14:18:20.000000000 +0100
@@ -0,0 +1,7 @@
+---
+features:
+ - |
+ Added a new memcached driver that uses pymemcache through dogpile.cache.
+
+ If willing to use this driver, make sure you have both
+ dogpile.cache>=1.1.2 and pymemcache>=3.4.0 installed.
diff -Nru python-oslo.cache-2.6.1/tox.ini python-oslo.cache-2.6.2/tox.ini
--- python-oslo.cache-2.6.1/tox.ini 2020-08-25 14:01:17.000000000 +0200
+++ python-oslo.cache-2.6.2/tox.ini 2021-02-09 14:18:20.000000000 +0100
@@ -8,7 +8,7 @@
whitelist_externals =
find
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
-r{toxinidir}/test-requirements.txt
commands =
find . -type f -name "*.pyc" -delete
@@ -34,7 +34,7 @@
[testenv:docs]
whitelist_externals = rm
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
-r{toxinidir}/doc/requirements.txt
commands =
rm -fr doc/build
@@ -65,8 +65,3 @@
commands =
rm -rf releasenotes/build
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
-
-[testenv:lower-constraints]
-deps =
- -c{toxinidir}/lower-constraints.txt
- -r{toxinidir}/test-requirements.txt
diff -Nru python-oslo.cache-2.6.1/.zuul.yaml python-oslo.cache-2.6.2/.zuul.yaml
--- python-oslo.cache-2.6.1/.zuul.yaml 2020-08-25 14:01:17.000000000 +0200
+++ python-oslo.cache-2.6.2/.zuul.yaml 2021-02-09 14:18:20.000000000 +0100
@@ -48,7 +48,6 @@
templates:
- check-requirements
- lib-forward-testing-python3
- - openstack-lower-constraints-jobs
- openstack-python3-victoria-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
Reply to: