Hello community,
here is the log from the commit of package python-oslo.privsep for
openSUSE:Factory checked in at 2020-10-26 16:17:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.privsep (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.privsep.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.privsep"
Mon Oct 26 16:17:00 2020 rev:14 rq:841214 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslo.privsep/python-oslo.privsep.changes
2020-06-05 20:18:28.047503647 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.privsep.new.3463/python-oslo.privsep.changes
2020-10-26 16:17:41.747001843 +0100
@@ -1,0 +2,20 @@
+Fri Oct 9 19:17:42 UTC 2020 - cloud-de...@suse.de
+
+- update to version 2.4.0
+ - Add release notes links to doc index
+ - Bump default tox env from py37 to py38
+ - Remove translation sections from setup.cfg
+ - Add py38 package metadata
+ - Replace assertItemsEqual with assertCountEqual
+ - Undo the eventlet monkey patch for the privileged daemon
+ - [goal] Migrate testing to ubuntu focal
+ - Align contributing doc with oslo's policy
+ - Remove the unused coding style modules
+ - Fix pygments style
+ - Add Python3 victoria unit tests
+ - Fix hacking min version to 3.0.1
+ - Switch to newer openstackdocstheme and reno versions
+ - Bump bandit version
+ - Update master for stable/ussuri
+
+-------------------------------------------------------------------
Old:
----
oslo.privsep-2.1.1.tar.gz
New:
----
oslo.privsep-2.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.privsep.spec ++++++
--- /var/tmp/diff_new_pack.0ngQLI/_old 2020-10-26 16:17:42.335002316 +0100
+++ /var/tmp/diff_new_pack.0ngQLI/_new 2020-10-26 16:17:42.339002320 +0100
@@ -17,16 +17,16 @@
Name: python-oslo.privsep
-Version: 2.1.1
+Version: 2.4.0
Release: 0
Summary: OpenStack library for privilege separation
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.privsep
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.privsep/oslo.privsep-2.1.1.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.privsep/oslo.privsep-2.4.0.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python3-cffi >= 1.7.0
-BuildRequires: python3-eventlet >= 0.18.2
+BuildRequires: python3-cffi >= 1.14.0
+BuildRequires: python3-eventlet >= 0.21.0
BuildRequires: python3-greenlet >= 0.4.14
BuildRequires: python3-mock
BuildRequires: python3-msgpack >= 0.6.0
@@ -36,7 +36,6 @@
BuildRequires: python3-oslo.utils >= 3.33.0
BuildRequires: python3-oslotest
BuildRequires: python3-pbr
-BuildRequires: python3-setuptools
BuildRequires: python3-stestr
BuildArch: noarch
@@ -46,8 +45,8 @@
%package -n python3-oslo.privsep
Summary: OpenStack library for privilege separation
Group: Development/Languages/Python
-Requires: python3-cffi >= 1.7.0
-Requires: python3-eventlet >= 0.18.2
+Requires: python3-cffi >= 1.14.0
+Requires: python3-eventlet >= 0.21.0
Requires: python3-greenlet >= 0.4.14
Requires: python3-msgpack >= 0.6.0
Requires: python3-oslo.config >= 5.2.0
@@ -72,7 +71,7 @@
Documentation for oslo.privsep
%prep
-%autosetup -p1 -n oslo.privsep-2.1.1
+%autosetup -p1 -n oslo.privsep-2.4.0
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.0ngQLI/_old 2020-10-26 16:17:42.371002346 +0100
+++ /var/tmp/diff_new_pack.0ngQLI/_new 2020-10-26 16:17:42.371002346 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/oslo.privsep/oslo.privsep.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/openstack/oslo.privsep/oslo.privsep.spec.j2</param>
<param name="output-name">python-oslo.privsep.spec</param>
- <param
name="requirements">https://opendev.org/openstack/oslo.privsep/raw/branch/stable/ussuri/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.privsep/raw/branch/stable/victoria/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,oslo.privsep</param>
</service>
++++++ oslo.privsep-2.1.1.tar.gz -> oslo.privsep-2.4.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/.zuul.yaml
new/oslo.privsep-2.4.0/.zuul.yaml
--- old/oslo.privsep-2.1.1/.zuul.yaml 2020-04-07 12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/.zuul.yaml 2020-09-11 21:23:03.000000000 +0200
@@ -3,7 +3,7 @@
- check-requirements
- lib-forward-testing-python3
- openstack-lower-constraints-jobs
- - openstack-python3-ussuri-jobs
+ - openstack-python3-victoria-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/AUTHORS
new/oslo.privsep-2.4.0/AUTHORS
--- old/oslo.privsep-2.1.1/AUTHORS 2020-04-07 12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/AUTHORS 2020-09-11 21:24:08.000000000 +0200
@@ -16,6 +16,7 @@
Eric Fried <openst...@fried.cc>
Eric Harney <ehar...@redhat.com>
Flavio Percoco <flape...@gmail.com>
+Ghanshyam Mann <gm...@ghanshyammann.com>
Hervé Beraud <hber...@redhat.com>
Hongbin Lu <hongbin...@huawei.com>
Javier Pena <jp...@redhat.com>
@@ -23,6 +24,7 @@
Joshua Harlow <harlo...@gmail.com>
Joshua Harlow <jxhar...@godaddy.com>
Kirill Bespalov <kbespa...@mirantis.com>
+Moisés Guimarães de Medeiros <mogui...@redhat.com>
OpenStack Release Bot <infra-r...@openstack.org>
Pavlo Shchelokovskyy <shchelokovs...@gmail.com>
Rodolfo Alonso Hernandez <ralon...@redhat.com>
@@ -51,3 +53,4 @@
sonu.kumar <sonu.ku...@nectechnologies.in>
wangqi <wang...@99cloud.net>
xgwang5843 <xgwang5...@fiberhome.com>
+zhangboye <zhangb...@inspur.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/CONTRIBUTING.rst
new/oslo.privsep-2.4.0/CONTRIBUTING.rst
--- old/oslo.privsep-2.1.1/CONTRIBUTING.rst 2020-04-07 12:06:51.000000000
+0200
+++ new/oslo.privsep-2.4.0/CONTRIBUTING.rst 2020-09-11 21:23:03.000000000
+0200
@@ -1,3 +1,8 @@
+If you would like to contribute to the development of oslo's libraries,
+first you must take a look to this page:
+
+
https://specs.openstack.org/openstack/oslo-specs/specs/policy/contributing.html
+
If you would like to contribute to the development of OpenStack, you must
follow the steps in this page:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/ChangeLog
new/oslo.privsep-2.4.0/ChangeLog
--- old/oslo.privsep-2.1.1/ChangeLog 2020-04-07 12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/ChangeLog 2020-09-11 21:24:08.000000000 +0200
@@ -1,6 +1,37 @@
CHANGES
=======
+2.4.0
+-----
+
+* [goal] Migrate testing to ubuntu focal
+* Bump bandit version
+
+2.3.0
+-----
+
+* Undo the eventlet monkey patch for the privileged daemon
+
+2.2.1
+-----
+
+* Replace assertItemsEqual with assertCountEqual
+* Fix pygments style
+
+2.2.0
+-----
+
+* Fix hacking min version to 3.0.1
+* Switch to newer openstackdocstheme and reno versions
+* Remove the unused coding style modules
+* Remove translation sections from setup.cfg
+* Align contributing doc with oslo's policy
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Add release notes links to doc index
+* Add Python3 victoria unit tests
+* Update master for stable/ussuri
+
2.1.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/PKG-INFO
new/oslo.privsep-2.4.0/PKG-INFO
--- old/oslo.privsep-2.1.1/PKG-INFO 2020-04-07 12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/PKG-INFO 2020-09-11 21:24:08.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.privsep
-Version: 2.1.1
+Version: 2.4.0
Summary: OpenStack library for privilege separation
Home-page: https://docs.openstack.org/oslo.privsep/latest/
Author: OpenStack
@@ -53,6 +53,7 @@
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 :: Only
Classifier: Programming Language :: Python :: Implementation :: CPython
Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/babel.cfg
new/oslo.privsep-2.4.0/babel.cfg
--- old/oslo.privsep-2.1.1/babel.cfg 2020-04-07 12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/babel.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-[python: **.py]
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/doc/requirements.txt
new/oslo.privsep-2.4.0/doc/requirements.txt
--- old/oslo.privsep-2.1.1/doc/requirements.txt 2020-04-07 12:06:51.000000000
+0200
+++ new/oslo.privsep-2.4.0/doc/requirements.txt 2020-09-11 21:23:03.000000000
+0200
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-openstackdocstheme>=1.20.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0 # BSD
-reno>=2.5.0 # Apache-2.0
+openstackdocstheme>=2.2.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+reno>=3.1.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.0 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/doc/source/conf.py
new/oslo.privsep-2.4.0/doc/source/conf.py
--- old/oslo.privsep-2.1.1/doc/source/conf.py 2020-04-07 12:06:51.000000000
+0200
+++ new/oslo.privsep-2.4.0/doc/source/conf.py 2020-09-11 21:23:03.000000000
+0200
@@ -23,9 +23,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.privsep'
-bug_project = 'oslo.privsep'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/oslo.privsep'
+openstackdocs_bug_project = 'oslo.privsep'
+openstackdocs_bug_tag = ''
# The suffix of source filenames.
source_suffix = '.rst'
@@ -34,7 +34,6 @@
master_doc = 'index'
# General information about the project.
-project = u'oslo.privsep'
copyright = u'2014, OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text.
@@ -45,7 +44,7 @@
add_module_names = True
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# -- Options for HTML output --------------------------------------------------
@@ -53,7 +52,6 @@
# Sphinx are currently 'default' and 'sphinxdoc'.
html_theme = 'openstackdocs'
-
# -- sphinxcontrib.apidoc configuration --------------------------------------
apidoc_module_dir = '../../oslo_privsep'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/doc/source/index.rst
new/oslo.privsep-2.4.0/doc/source/index.rst
--- old/oslo.privsep-2.1.1/doc/source/index.rst 2020-04-07 12:06:51.000000000
+0200
+++ new/oslo.privsep-2.4.0/doc/source/index.rst 2020-09-11 21:23:03.000000000
+0200
@@ -24,6 +24,13 @@
contributor/index
reference/index
+Release Notes
+=============
+
+Read also the `oslo.privsep Release Notes
+<https://docs.openstack.org/releasenotes/oslo.privsep/>`_.
+
+
Indices and tables
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/lower-constraints.txt
new/oslo.privsep-2.4.0/lower-constraints.txt
--- old/oslo.privsep-2.1.1/lower-constraints.txt 2020-04-07
12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/lower-constraints.txt 2020-09-11
21:23:03.000000000 +0200
@@ -2,11 +2,11 @@
appdirs==1.3.0
Babel==2.3.4
bandit==1.1.0
-cffi==1.7.0
+cffi==1.14.0
debtcollector==1.2.0
docutils==0.11
dulwich==0.15.0
-eventlet==0.18.2
+eventlet==0.21.0
extras==1.0.0
fixtures==3.0.0
gitdb==0.6.4
@@ -18,12 +18,10 @@
keystoneauth1==3.4.0
linecache2==1.0.0
MarkupSafe==1.0
-mccabe==0.2.1
mox3==0.20.0
msgpack==0.6.0
netaddr==0.7.18
netifaces==0.10.4
-openstackdocstheme==1.20.0
os-client-config==1.28.0
oslo.config==5.2.0
oslo.context==2.19.2
@@ -42,15 +40,12 @@
python-subunit==1.0.0
pytz==2013.6
PyYAML==3.13
-reno==2.5.0
requests==2.14.2
requestsexceptions==1.2.0
rfc3986==0.3.1
six==1.10.0
smmap==0.9.0
snowballstemmer==1.2.1
-Sphinx==1.8.0
-sphinxcontrib-websupport==1.0.1
stestr==2.0.0
stevedore==1.20.0
testtools==2.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/oslo.privsep.egg-info/PKG-INFO
new/oslo.privsep-2.4.0/oslo.privsep.egg-info/PKG-INFO
--- old/oslo.privsep-2.1.1/oslo.privsep.egg-info/PKG-INFO 2020-04-07
12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo.privsep.egg-info/PKG-INFO 2020-09-11
21:24:08.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.privsep
-Version: 2.1.1
+Version: 2.4.0
Summary: OpenStack library for privilege separation
Home-page: https://docs.openstack.org/oslo.privsep/latest/
Author: OpenStack
@@ -53,6 +53,7 @@
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 :: Only
Classifier: Programming Language :: Python :: Implementation :: CPython
Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/oslo.privsep.egg-info/SOURCES.txt
new/oslo.privsep-2.4.0/oslo.privsep.egg-info/SOURCES.txt
--- old/oslo.privsep-2.1.1/oslo.privsep.egg-info/SOURCES.txt 2020-04-07
12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo.privsep.egg-info/SOURCES.txt 2020-09-11
21:24:08.000000000 +0200
@@ -8,7 +8,6 @@
HACKING.rst
LICENSE
README.rst
-babel.cfg
lower-constraints.txt
requirements.txt
setup.cfg
@@ -54,6 +53,7 @@
releasenotes/notes/add_thread_pool_size-a54e6f27ab019f96.yaml
releasenotes/notes/auto-restart-client-channel-619545294557bf2b.yaml
releasenotes/notes/drop-python27-support-6da3028c1cf099eb.yaml
+releasenotes/notes/un-monkey-patch-privileged-daemon-160e00296549df3d.yaml
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/newton.rst
@@ -64,6 +64,7 @@
releasenotes/source/stein.rst
releasenotes/source/train.rst
releasenotes/source/unreleased.rst
+releasenotes/source/ussuri.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/oslo.privsep.egg-info/pbr.json
new/oslo.privsep-2.4.0/oslo.privsep.egg-info/pbr.json
--- old/oslo.privsep-2.1.1/oslo.privsep.egg-info/pbr.json 2020-04-07
12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo.privsep.egg-info/pbr.json 2020-09-11
21:24:08.000000000 +0200
@@ -1 +1 @@
-{"git_version": "5f49e8f", "is_release": true}
\ No newline at end of file
+{"git_version": "512b5d9", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.privsep-2.1.1/oslo.privsep.egg-info/requires.txt
new/oslo.privsep-2.4.0/oslo.privsep.egg-info/requires.txt
--- old/oslo.privsep-2.1.1/oslo.privsep.egg-info/requires.txt 2020-04-07
12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo.privsep.egg-info/requires.txt 2020-09-11
21:24:08.000000000 +0200
@@ -1,8 +1,8 @@
-oslo.log>=3.36.0
-oslo.i18n>=3.15.3
-oslo.config>=5.2.0
-oslo.utils>=3.33.0
-cffi>=1.7.0
-eventlet!=0.18.3,!=0.20.1,>=0.18.2
+cffi>=1.14.0
+eventlet>=0.21.0
greenlet>=0.4.14
msgpack>=0.6.0
+oslo.config>=5.2.0
+oslo.i18n>=3.15.3
+oslo.log>=3.36.0
+oslo.utils>=3.33.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/oslo_privsep/daemon.py
new/oslo.privsep-2.4.0/oslo_privsep/daemon.py
--- old/oslo.privsep-2.1.1/oslo_privsep/daemon.py 2020-04-07
12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo_privsep/daemon.py 2020-09-11
21:23:03.000000000 +0200
@@ -57,6 +57,7 @@
import threading
import eventlet
+from eventlet import patcher
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import encodeutils
@@ -75,6 +76,25 @@
LOG = logging.getLogger(__name__)
+EVENTLET_MODULES = ('os', 'select', 'socket', 'thread', 'time', 'MySQLdb',
+ 'builtins', 'subprocess')
+EVENTLET_LIBRARIES = []
+
+
+def _null():
+ return []
+
+
+for module in EVENTLET_MODULES:
+ if hasattr(patcher, '_green_%s_modules' % module):
+ method = getattr(patcher, '_green_%s_modules' % module)
+ elif hasattr(patcher, '_green_%s' % module):
+ method = getattr(patcher, '_green_%s' % module)
+ else:
+ method = _null()
+ EVENTLET_LIBRARIES.append((module, method))
+
+
@enum.unique
class StdioFd(enum.IntEnum):
# NOTE(gus): We can't use sys.std*.fileno() here. sys.std*
@@ -258,6 +278,21 @@
log_root.addHandler(handler)
+def un_monkey_patch():
+ for eventlet_mod_name, func_modules in EVENTLET_LIBRARIES:
+ if not eventlet.patcher.is_monkey_patched(eventlet_mod_name):
+ continue
+
+ for name, mod in func_modules():
+ patched_mod = sys.modules.get(name)
+ orig_mod = eventlet.patcher.original(name)
+ for attr_name in mod.__patched__:
+ patched_attr = getattr(mod, attr_name, None)
+ unpatched_attr = getattr(orig_mod, attr_name, None)
+ if patched_attr is not None:
+ setattr(patched_mod, attr_name, unpatched_attr)
+
+
class ForkingClientChannel(_ClientChannel):
def __init__(self, context):
"""Start privsep daemon using fork()
@@ -279,6 +314,7 @@
if os.fork() == 0:
# child
+ un_monkey_patch()
channel = comm.ServerChannel(sock_b)
sock_a.close()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.privsep-2.1.1/oslo_privsep/tests/test_capabilities.py
new/oslo.privsep-2.4.0/oslo_privsep/tests/test_capabilities.py
--- old/oslo.privsep-2.1.1/oslo_privsep/tests/test_capabilities.py
2020-04-07 12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo_privsep/tests/test_capabilities.py
2020-09-11 21:23:03.000000000 +0200
@@ -34,7 +34,7 @@
# Disappointingly, ffi.cast(type, 1) != ffi.cast(type, 1)
# so can't just use assert_called_once_with :-(
self.assertEqual(1, mock_prctl.call_count)
- self.assertItemsEqual(
+ self.assertCountEqual(
[8, 1], # [PR_SET_KEEPCAPS, true]
[int(x) for x in mock_prctl.call_args[0]])
@@ -81,7 +81,7 @@
return 0
mock_capget.side_effect = impl
- self.assertItemsEqual(
+ self.assertCountEqual(
([17, 24, 49],
[8, 10, 35, 56],
[24, 31, 40]),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/oslo_privsep/tests/test_daemon.py
new/oslo.privsep-2.4.0/oslo_privsep/tests/test_daemon.py
--- old/oslo.privsep-2.1.1/oslo_privsep/tests/test_daemon.py 2020-04-07
12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/oslo_privsep/tests/test_daemon.py 2020-09-11
21:23:03.000000000 +0200
@@ -13,6 +13,7 @@
# under the License.
import copy
+import eventlet
import fixtures
import functools
import logging as pylogging
@@ -165,7 +166,7 @@
mock_setgid.assert_called_once_with(84)
mock_setgroups.assert_called_once_with([])
- self.assertItemsEqual(
+ self.assertCountEqual(
[mock.call(True), mock.call(False)],
mock_keepcaps.mock_calls)
@@ -215,3 +216,30 @@
with mock.patch.object(daemon.LOG, 'warning') as mock_warning:
self.client_channel.out_of_band([daemon.Message.PING])
mock_warning.assert_called_once()
+
+
+class UnMonkeyPatch(base.BaseTestCase):
+
+ def test_un_monkey_patch(self):
+ self.assertFalse(any(
+ eventlet.patcher.is_monkey_patched(eventlet_mod_name)
+ for eventlet_mod_name in daemon.EVENTLET_MODULES))
+
+ eventlet.monkey_patch()
+ self.assertTrue(any(
+ eventlet.patcher.is_monkey_patched(eventlet_mod_name)
+ for eventlet_mod_name in daemon.EVENTLET_MODULES))
+
+ daemon.un_monkey_patch()
+ for eventlet_mod_name, func_modules in daemon.EVENTLET_LIBRARIES:
+ if not eventlet.patcher.is_monkey_patched(eventlet_mod_name):
+ continue
+
+ for name, green_mod in func_modules():
+ orig_mod = eventlet.patcher.original(name)
+ patched_mod = sys.modules.get(name)
+ for attr_name in green_mod.__patched__:
+ un_monkey_patched_attr = getattr(patched_mod, attr_name,
+ None)
+ original_attr = getattr(orig_mod, attr_name, None)
+ self.assertEqual(un_monkey_patched_attr, original_attr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.privsep-2.1.1/releasenotes/notes/un-monkey-patch-privileged-daemon-160e00296549df3d.yaml
new/oslo.privsep-2.4.0/releasenotes/notes/un-monkey-patch-privileged-daemon-160e00296549df3d.yaml
---
old/oslo.privsep-2.1.1/releasenotes/notes/un-monkey-patch-privileged-daemon-160e00296549df3d.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.privsep-2.4.0/releasenotes/notes/un-monkey-patch-privileged-daemon-160e00296549df3d.yaml
2020-09-11 21:23:03.000000000 +0200
@@ -0,0 +1,11 @@
+---
+other:
+ - |
+ The ``oslo.privsep`` client can be called from a program using eventlet.
+ If ``eventlet.monkey_patch``, some libraries will be patched, for example
+ ``threading`` or ``os``. When the root daemon is forked from the client
+ process, those libraries remain patched. Now, when the daemon is forked
+ from the client process, those libraries and methods are restored to the
+ original values. The goal is to prevent some timeouts when using eventlet
+ threads (user threads); system threads are preemptive and the code does
+ not need to care about the executor token.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/releasenotes/source/conf.py
new/oslo.privsep-2.4.0/releasenotes/source/conf.py
--- old/oslo.privsep-2.1.1/releasenotes/source/conf.py 2020-04-07
12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/releasenotes/source/conf.py 2020-09-11
21:23:03.000000000 +0200
@@ -40,9 +40,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.privsep'
-bug_project = 'oslo.privsep'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/oslo.privsep'
+openstackdocs_bug_project = 'oslo.privsep'
+openstackdocs_bug_tag = ''
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -96,7 +96,7 @@
# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/releasenotes/source/index.rst
new/oslo.privsep-2.4.0/releasenotes/source/index.rst
--- old/oslo.privsep-2.1.1/releasenotes/source/index.rst 2020-04-07
12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/releasenotes/source/index.rst 2020-09-11
21:23:03.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ ussuri
train
stein
rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/releasenotes/source/ussuri.rst
new/oslo.privsep-2.4.0/releasenotes/source/ussuri.rst
--- old/oslo.privsep-2.1.1/releasenotes/source/ussuri.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.privsep-2.4.0/releasenotes/source/ussuri.rst 2020-09-11
21:23:03.000000000 +0200
@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+ :branch: stable/ussuri
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/requirements.txt
new/oslo.privsep-2.4.0/requirements.txt
--- old/oslo.privsep-2.1.1/requirements.txt 2020-04-07 12:06:51.000000000
+0200
+++ new/oslo.privsep-2.4.0/requirements.txt 2020-09-11 21:23:03.000000000
+0200
@@ -6,7 +6,7 @@
oslo.i18n>=3.15.3 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
-cffi>=1.7.0 # MIT
-eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
+cffi>=1.14.0 # MIT
+eventlet>=0.21.0 # MIT
greenlet>=0.4.14 # MIT
msgpack>=0.6.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/setup.cfg
new/oslo.privsep-2.4.0/setup.cfg
--- old/oslo.privsep-2.1.1/setup.cfg 2020-04-07 12:07:53.000000000 +0200
+++ new/oslo.privsep-2.4.0/setup.cfg 2020-09-11 21:24:08.000000000 +0200
@@ -17,6 +17,7 @@
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
@@ -30,20 +31,6 @@
oslo.config.opts =
oslo.privsep = oslo_privsep.priv_context:_list_opts
-[compile_catalog]
-directory = oslo.privsep/locale
-domain = oslo_privsep
-
-[update_catalog]
-domain = oslo_privsep
-output_dir = oslo_privsep/locale
-input_file = oslo_privsep/locale/oslo_privsep.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = oslo_privsep/locale/oslo_privsep.pot
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/test-requirements.txt
new/oslo.privsep-2.4.0/test-requirements.txt
--- old/oslo.privsep-2.1.1/test-requirements.txt 2020-04-07
12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/test-requirements.txt 2020-09-11
21:23:03.000000000 +0200
@@ -2,10 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=3.0,<3.1.0 # Apache-2.0
+hacking>=3.0.1,<3.1.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
stestr>=2.0.0 # Apache-2.0
# Bandit security code scanner
-bandit>=1.1.0,<1.6.0 # Apache-2.0
+bandit>=1.6.0,<1.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.privsep-2.1.1/tox.ini
new/oslo.privsep-2.4.0/tox.ini
--- old/oslo.privsep-2.1.1/tox.ini 2020-04-07 12:06:51.000000000 +0200
+++ new/oslo.privsep-2.4.0/tox.ini 2020-09-11 21:23:03.000000000 +0200
@@ -1,6 +1,6 @@
[tox]
minversion = 3.1.1
-envlist = py37,pypy,pep8
+envlist = py38,pypy,pep8
ignore_basepython_conflict = true
[testenv]
