Hello community,
here is the log from the commit of package python-oslo.log for openSUSE:Factory
checked in at 2019-01-24 14:15:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.log (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.log.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.log"
Thu Jan 24 14:15:20 2019 rev:14 rq:668115 version:3.39.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslo.log/python-oslo.log.changes
2018-09-07 15:40:33.790461556 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.log.new.28833/python-oslo.log.changes
2019-01-24 14:15:21.499227731 +0100
@@ -1,0 +2,9 @@
+Thu Oct 11 21:27:43 UTC 2018 - [email protected]
+
+- update to version 3.39.2
+ - Update UPPER_CONSTRAINTS_FILE for stable/rocky
+ - Update .gitreview for stable/rocky
+ - import zuul job settings from project-config
+ - Filter args dict in JSONFormatter
+
+-------------------------------------------------------------------
Old:
----
oslo.log-3.39.0.tar.gz
New:
----
oslo.log-3.39.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.log.spec ++++++
--- /var/tmp/diff_new_pack.KduWNx/_old 2019-01-24 14:15:22.283226824 +0100
+++ /var/tmp/diff_new_pack.KduWNx/_new 2019-01-24 14:15:22.283226824 +0100
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: python-oslo.log
-Version: 3.39.0
+Version: 3.39.2
Release: 0
Summary: OpenStack log library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.log
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.log/oslo.log-3.39.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.log/oslo.log-3.39.2.tar.gz
BuildRequires: openstack-macros
BuildRequires: python-devel
BuildRequires: python2-mock
@@ -95,7 +95,7 @@
Documentation for the oslo.log library.
%prep
-%autosetup -p1 -n oslo.log-3.39.0
+%autosetup -p1 -n oslo.log-3.39.2
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
++++++ oslo.log-3.39.0.tar.gz -> oslo.log-3.39.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/.zuul.yaml
new/oslo.log-3.39.2/.zuul.yaml
--- old/oslo.log-3.39.0/.zuul.yaml 2018-06-27 10:26:18.000000000 +0200
+++ new/oslo.log-3.39.2/.zuul.yaml 2018-09-25 21:44:42.000000000 +0200
@@ -22,3 +22,11 @@
gate:
jobs:
- openstack-tox-lower-constraints
+ templates:
+ - openstack-python-jobs
+ - openstack-python35-jobs
+ - publish-openstack-docs-pti
+ - check-requirements
+ - lib-forward-testing
+ - release-notes-jobs-python3
+ - periodic-stable-jobs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/ChangeLog
new/oslo.log-3.39.2/ChangeLog
--- old/oslo.log-3.39.0/ChangeLog 2018-06-27 10:29:41.000000000 +0200
+++ new/oslo.log-3.39.2/ChangeLog 2018-09-25 21:47:34.000000000 +0200
@@ -1,6 +1,14 @@
CHANGES
=======
+3.39.2
+------
+
+* Filter args dict in JSONFormatter
+* import zuul job settings from project-config
+* Update UPPER\_CONSTRAINTS\_FILE for stable/rocky
+* Update .gitreview for stable/rocky
+
3.39.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/PKG-INFO new/oslo.log-3.39.2/PKG-INFO
--- old/oslo.log-3.39.0/PKG-INFO 2018-06-27 10:29:43.000000000 +0200
+++ new/oslo.log-3.39.2/PKG-INFO 2018-09-25 21:47:36.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: oslo.log
-Version: 3.39.0
+Version: 3.39.2
Summary: oslo.log library
Home-page: https://docs.openstack.org/oslo.log/latest
Author: OpenStack
@@ -50,6 +50,6 @@
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.5
+Provides-Extra: systemd
Provides-Extra: fixtures
Provides-Extra: test
-Provides-Extra: systemd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/oslo.log.egg-info/PKG-INFO
new/oslo.log-3.39.2/oslo.log.egg-info/PKG-INFO
--- old/oslo.log-3.39.0/oslo.log.egg-info/PKG-INFO 2018-06-27
10:29:41.000000000 +0200
+++ new/oslo.log-3.39.2/oslo.log.egg-info/PKG-INFO 2018-09-25
21:47:35.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: oslo.log
-Version: 3.39.0
+Version: 3.39.2
Summary: oslo.log library
Home-page: https://docs.openstack.org/oslo.log/latest
Author: OpenStack
@@ -50,6 +50,6 @@
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.5
+Provides-Extra: systemd
Provides-Extra: fixtures
Provides-Extra: test
-Provides-Extra: systemd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/oslo.log.egg-info/pbr.json
new/oslo.log-3.39.2/oslo.log.egg-info/pbr.json
--- old/oslo.log-3.39.0/oslo.log.egg-info/pbr.json 2018-06-27
10:29:41.000000000 +0200
+++ new/oslo.log-3.39.2/oslo.log.egg-info/pbr.json 2018-09-25
21:47:35.000000000 +0200
@@ -1 +1 @@
-{"git_version": "3b43002", "is_release": true}
\ No newline at end of file
+{"git_version": "871d2df", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/oslo_log/formatters.py
new/oslo.log-3.39.2/oslo_log/formatters.py
--- old/oslo.log-3.39.0/oslo_log/formatters.py 2018-06-27 10:26:18.000000000
+0200
+++ new/oslo.log-3.39.2/oslo_log/formatters.py 2018-09-25 21:44:30.000000000
+0200
@@ -17,6 +17,7 @@
import logging
import logging.config
import logging.handlers
+import re
import socket
import sys
import traceback
@@ -180,6 +181,9 @@
return dict.get(self, key, None) or '-'
+_MSG_KEY_REGEX = re.compile('(%+)\((\w+)\)')
+
+
class JSONFormatter(logging.Formatter):
def __init__(self, fmt=None, datefmt=None, style='%'):
# NOTE(sfinucan) we ignore the fmt and style arguments, but they're
@@ -206,11 +210,22 @@
return lines
def format(self, record):
+ args = record.args
+ if isinstance(args, dict):
+ msg_keys = _MSG_KEY_REGEX.findall(record.msg)
+ # NOTE(bnemec): The logic around skipping escaped placeholders is
+ # tricky and error-prone to include in the regex. Much easier to
+ # just grab them all and filter after the fact.
+ msg_keys = [m[1] for m in msg_keys if len(m[0]) == 1]
+ # If no named keys were found, then the entire dict must have been
+ # the value to be formatted. Don't filter anything.
+ if msg_keys:
+ args = {k: v for k, v in args.items() if k in msg_keys}
message = {'message': record.getMessage(),
'asctime': self.formatTime(record, self.datefmt),
'name': record.name,
'msg': record.msg,
- 'args': record.args,
+ 'args': args,
'levelname': record.levelname,
'levelno': record.levelno,
'pathname': record.pathname,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/oslo_log/tests/unit/test_log.py
new/oslo.log-3.39.2/oslo_log/tests/unit/test_log.py
--- old/oslo.log-3.39.0/oslo_log/tests/unit/test_log.py 2018-06-27
10:26:18.000000000 +0200
+++ new/oslo.log-3.39.2/oslo_log/tests/unit/test_log.py 2018-09-25
21:44:42.000000000 +0200
@@ -591,6 +591,22 @@
# convert it using repr() to prevent serialization error on logging.
self.assertEqual(['repr'], data['args'])
+ def test_extra_args_filtered(self):
+ test_msg = 'This is a %(test)s line %%(unused)'
+ test_data = {'test': 'log', 'unused': 'removeme'}
+ self.log.debug(test_msg, test_data)
+
+ data = jsonutils.loads(self.stream.getvalue())
+ self.assertNotIn('unused', data['args'])
+
+ def test_entire_dict(self):
+ test_msg = 'This is a %s dict'
+ test_data = {'test': 'log', 'other': 'value'}
+ self.log.debug(test_msg, test_data)
+
+ data = jsonutils.loads(self.stream.getvalue())
+ self.assertEqual(test_data, data['args'])
+
def get_fake_datetime(retval):
class FakeDateTime(datetime.datetime):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.log-3.39.0/tox.ini new/oslo.log-3.39.2/tox.ini
--- old/oslo.log-3.39.0/tox.ini 2018-06-27 10:26:18.000000000 +0200
+++ new/oslo.log-3.39.2/tox.ini 2018-09-25 21:44:42.000000000 +0200
@@ -7,7 +7,7 @@
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=oslo.log
-install_command = {toxinidir}/tools/tox_install.sh
{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
{opts} {packages}
+install_command = {toxinidir}/tools/tox_install.sh
{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
{opts} {packages}
deps = -r{toxinidir}/test-requirements.txt
-e.[fixtures]
commands =
