Sync from SUSE:SLFO:Main python-python-json-logger revision 9cdf1dffd05a8b94695d6f61e679c959

This commit is contained in:
Adrian Schröter 2024-10-03 17:55:24 +02:00
parent 02dd7d9889
commit 0708905b2e
3 changed files with 61 additions and 11 deletions

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Feb 1 01:18:35 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch support-python312.patch:
* Support logging changes in Python 3.12+.
-------------------------------------------------------------------
Tue Jan 2 22:49:44 UTC 2024 - Dirk Müller <dmueller@suse.com>
- require setuptools
-------------------------------------------------------------------
Thu Jul 20 13:09:51 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Clean up the SPEC file.
- Switch to %pyproject_* macros.
-------------------------------------------------------------------
Wed Jul 19 13:18:33 UTC 2023 - ecsos <ecsos@opensuse.org>
- Add %{?sle15_python_module_pythons}
-------------------------------------------------------------------
Wed May 3 09:09:17 UTC 2023 - Dirk Müller <dmueller@suse.com>
@ -34,13 +56,13 @@ Thu Oct 6 22:41:33 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
Changed a link archive of the reference page in case it's down. - @ahonnecke
Removed unnecessary try-except around OrderedDict usage - @sozofaan
Update documentation link to json module + use https - @deronnax
Dropped 3.5 support. - @bringhurst
Dropped 3.5 support. - @bringhurst
-------------------------------------------------------------------
Sat Nov 6 18:37:44 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 2.0.2:
* drop python 3.4 support
* drop python 3.4 support
-------------------------------------------------------------------
Fri May 28 08:49:54 UTC 2021 - pgajdos@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-python-json-logger
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,19 +16,21 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
%{?sle15_python_module_pythons}
Name: python-python-json-logger
Version: 2.0.7
Release: 0
Summary: A python library adding a json log formatter
License: BSD-2-Clause
Group: Development/Languages/Python
URL: https://github.com/madzak/python-json-logger
Source: https://files.pythonhosted.org/packages/source/p/python-json-logger/python-json-logger-%{version}.tar.gz
# PATCH-FIX-UPSTREAM gh#madzak/python-json-logger#183
Patch0: support-python312.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-setuptools
BuildArch: noarch
%python_subpackages
@ -36,13 +38,14 @@ BuildArch: noarch
A python library adding a json log formatter.
%prep
%setup -q -n python-json-logger-%{version}
%autosetup -p1 -n python-json-logger-%{version}
%build
%python_build
%pyproject_wheel
%install
%python_install
%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
%pyunittest discover -v
@ -50,6 +53,7 @@ A python library adding a json log formatter.
%files %{python_files}
%doc README.md
%license LICENSE
%{python_sitelib}/*
%{python_sitelib}/pythonjsonlogger
%{python_sitelib}/python_json_logger-%{version}.dist-info
%changelog

24
support-python312.patch Normal file
View File

@ -0,0 +1,24 @@
From 7c8d06925305c578a1dc7a45d6180c2876cfc082 Mon Sep 17 00:00:00 2001
From: finswimmer <finswimmer77@gmail.com>
Date: Mon, 9 Oct 2023 13:56:38 +0200
Subject: [PATCH] feat: add taskName to RESERVED_ATTRS
taskName was added in Python 3.12
---
src/pythonjsonlogger/jsonlogger.py | 1 +
1 file changed, 1 insertion(+)
Index: python-json-logger-2.0.7/src/pythonjsonlogger/jsonlogger.py
===================================================================
--- python-json-logger-2.0.7.orig/src/pythonjsonlogger/jsonlogger.py
+++ python-json-logger-2.0.7/src/pythonjsonlogger/jsonlogger.py
@@ -21,7 +21,8 @@ RESERVED_ATTRS: Tuple[str, ...] = (
'args', 'asctime', 'created', 'exc_info', 'exc_text', 'filename',
'funcName', 'levelname', 'levelno', 'lineno', 'module',
'msecs', 'message', 'msg', 'name', 'pathname', 'process',
- 'processName', 'relativeCreated', 'stack_info', 'thread', 'threadName')
+ 'processName', 'relativeCreated', 'stack_info', 'thread', 'threadName',
+ 'taskName')