import python-json-logger-2.0.4-8.el10

i10ce changed/i10ce/python-json-logger-2.0.4-8.el10
Arkady L. Shane 1 month ago
commit 851f5e97a9
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

1
.gitignore vendored

@ -0,0 +1 @@
SOURCES/python-json-logger-2.0.4.tar.gz

@ -0,0 +1 @@
5048fd6c3a565350c610398cc8220595d65b37ef SOURCES/python-json-logger-2.0.4.tar.gz

@ -0,0 +1,43 @@
From f939f827a113d9b842486a029b08c85c0f09792a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Tue, 4 Jul 2023 09:20:35 +0200
Subject: [PATCH] Adjust tests for taskName attribute added in Python 3.12
---
tests/tests.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/tests.py b/tests/tests.py
index 9f433d0..fc907d6 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -45,7 +45,7 @@ class TestJsonLogger(unittest.TestCase):
def testPercentageFormat(self):
fr = jsonlogger.JsonFormatter(
# All kind of different styles to check the regex
- '[%(levelname)8s] %(message)s %(filename)s:%(lineno)d %(asctime)'
+ '[%(levelname)8s] %(message)s %(filename)s:%(lineno)d %(asctime) %(taskName)'
)
self.logHandler.setFormatter(fr)
@@ -54,7 +54,7 @@ class TestJsonLogger(unittest.TestCase):
logJson = json.loads(self.buffer.getvalue())
self.assertEqual(logJson["message"], msg)
- self.assertEqual(logJson.keys(), {'levelname', 'message', 'filename', 'lineno', 'asctime'})
+ self.assertEqual(logJson.keys(), {'levelname', 'message', 'filename', 'lineno', 'asctime', 'taskName'})
def testRenameBaseField(self):
fr = jsonlogger.JsonFormatter(rename_fields={'message': '@message'})
@@ -256,7 +256,7 @@ class TestJsonLogger(unittest.TestCase):
self.logger.info(" message", extra=value)
msg = self.buffer.getvalue()
- self.assertEqual(msg, "{\"message\": \" message\", \"special\": [3.0, 8.0]}\n")
+ self.assertEqual(msg, "{\"message\": \" message\", \"taskName\": null, \"special\": [3.0, 8.0]}\n")
if __name__ == '__main__':
if len(sys.argv[1:]) > 0:
--
2.40.1

@ -0,0 +1,36 @@
From c6e353b56a925b3549a73e6ac31b7478950afed3 Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Mon, 10 Jun 2024 13:31:29 +0200
Subject: [PATCH] Python 3.13 compatibility: logger creates values with time_ns
---
tests/tests.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/tests.py b/tests/tests.py
index fc907d6..669cb32 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -170,13 +170,17 @@ class TestJsonLogger(unittest.TestCase):
"1900-01-01T00:00:00")
@unittest.mock.patch('time.time', return_value=1500000000.0)
- def testJsonDefaultEncoderWithTimestamp(self, time_mock):
+ @unittest.mock.patch('time.time_ns', return_value=1500000000000000000)
+ def testJsonDefaultEncoderWithTimestamp(self, time_ns_mock, time_mock):
fr = jsonlogger.JsonFormatter(timestamp=True)
self.logHandler.setFormatter(fr)
self.logger.info("Hello")
- self.assertTrue(time_mock.called)
+ if sys.version_info < (3, 13):
+ self.assertTrue(time_mock.called)
+ else:
+ self.assertTrue(time_ns_mock.called)
logJson = json.loads(self.buffer.getvalue())
self.assertEqual(logJson.get("timestamp"), "2017-07-14T02:40:00+00:00")
--
2.44.0

@ -0,0 +1,147 @@
%{?python_enable_dependency_generator}
%global pypi_name python-json-logger
Name: python-json-logger
Version: 2.0.4
Release: 8%{?dist}
Summary: A python library adding a json log formatter
License: BSD
URL: http://github.com/madzak/python-json-logger
Source0: %{pypi_source}
# Patch for compatibility with Python 3.12, doesn't work with older Pythons
# https://github.com/madzak/python-json-logger/pull/178
Patch: Adjust-tests-for-taskName-attribute-added-in-Python-.patch
# Compatibility with Python 3.13
# https://github.com/madzak/python-json-logger/pull/192
Patch: Python-3.13-compatibility-logger-creates-values-with.patch
BuildArch: noarch
%description
A python library adding a json log formatter
%package -n python3-json-logger
Summary: A python library adding a json log formatter
%{?python_provide:%python_provide python3-json-logger}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%description -n python3-json-logger
A python library adding a json log formatter
%prep
%autosetup -n %{pypi_name}-%{version} -p1
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
%build
%py3_build
%install
%py3_install
%check
PYTHONPATH=%{buildroot}/%{python3_sitelib} %{__python3} -m unittest discover
%files -n python3-json-logger
%license LICENSE
%{python3_sitelib}/pythonjsonlogger
%{python3_sitelib}/python_json_logger-%{version}-py%{python3_version}.egg-info
%changelog
* Sun Jan 05 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.0.4-8
- Rebuilt for MSVSphere 10
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jun 10 2024 Python Maint <python-maint@redhat.com> - 2.0.4-7
- Rebuilt for Python 3.13
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.0.4-6
- Rebuilt for Python 3.13
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.0.4-2
- Rebuilt for Python 3.12
* Mon Feb 06 2023 Lumír Balhar <lbalhar@redhat.com> - 2.0.4-1
- Update to 2.0.4 (rhbz#1597299)
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.1.7-19
- Rebuilt for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.1.7-16
- Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.1.7-13
- Rebuilt for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.1.7-11
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.1.7-10
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 02 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.7-7
- Enable python dependency generator
* Wed Jan 02 2019 Miro Hrončok <mhroncok@redhat.com> - 0.1.7-6
- Subpackage python2-json-logger has been removed
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.1.7-4
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 19 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.1.7-2
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Mon Jun 12 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 0.1.7-1
- Initial package.
Loading…
Cancel
Save