From cb2d4b4a4251f99a3abe8c2679c6fc9d947f7636b209df39910b4c227cf6ce43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 16 Apr 2025 02:05:59 +0200 Subject: [PATCH] Sync from SUSE:SLFO:1.1 python-python-json-logger revision 6e48b17c6cf1c7b81f397a039ad32c51 --- python-python-json-logger.changes | 26 ++------------------------ python-python-json-logger.spec | 22 +++++++++------------- support-python312.patch | 24 ------------------------ 3 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 support-python312.patch diff --git a/python-python-json-logger.changes b/python-python-json-logger.changes index d63a682..a2e6d92 100644 --- a/python-python-json-logger.changes +++ b/python-python-json-logger.changes @@ -1,25 +1,3 @@ -------------------------------------------------------------------- -Thu Feb 1 01:18:35 UTC 2024 - Steve Kowalik - -- Add patch support-python312.patch: - * Support logging changes in Python 3.12+. - -------------------------------------------------------------------- -Tue Jan 2 22:49:44 UTC 2024 - Dirk Müller - -- require setuptools - -------------------------------------------------------------------- -Thu Jul 20 13:09:51 UTC 2023 - Matej Cepl - -- Clean up the SPEC file. -- Switch to %pyproject_* macros. - -------------------------------------------------------------------- -Wed Jul 19 13:18:33 UTC 2023 - ecsos - -- Add %{?sle15_python_module_pythons} - ------------------------------------------------------------------- Wed May 3 09:09:17 UTC 2023 - Dirk Müller @@ -56,13 +34,13 @@ Thu Oct 6 22:41:33 UTC 2022 - Yogalakshmi Arunachalam 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 - 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 diff --git a/python-python-json-logger.spec b/python-python-json-logger.spec index 4d0f60a..5b4789b 100644 --- a/python-python-json-logger.spec +++ b/python-python-json-logger.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-json-logger # -# Copyright (c) 2024 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 @@ -16,21 +16,19 @@ # -%{?sle15_python_module_pythons} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 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 @@ -38,14 +36,13 @@ BuildArch: noarch A python library adding a json log formatter. %prep -%autosetup -p1 -n python-json-logger-%{version} +%setup -q -n python-json-logger-%{version} %build -%pyproject_wheel +%python_build %install -%pyproject_install -%python_expand %fdupes %{buildroot}%{$python_sitelib} +%python_install %check %pyunittest discover -v @@ -53,7 +50,6 @@ A python library adding a json log formatter. %files %{python_files} %doc README.md %license LICENSE -%{python_sitelib}/pythonjsonlogger -%{python_sitelib}/python_json_logger-%{version}.dist-info +%{python_sitelib}/* %changelog diff --git a/support-python312.patch b/support-python312.patch deleted file mode 100644 index 8aa1455..0000000 --- a/support-python312.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7c8d06925305c578a1dc7a45d6180c2876cfc082 Mon Sep 17 00:00:00 2001 -From: finswimmer -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') - - -