Adding metadata

3 files changed, 97 insertions, 0 deletions

diff --git a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch b/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch
new file mode 100644
index 000000000000..1cab3b851ff6
--- /dev/null
+++ b/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch
@@ -0,0 +1,38 @@
+From 0ce621a8dd9dfa708a920c0ad90df8f7593b6110 Mon Sep 17 00:00:00 2001
+From: cache-miss <cache-miss>
+Date: Sat, 9 Mar 2024 18:27:24 +0800
+Subject: [PATCH] add taskName to reserved_attrs which was added in python 3.12
+
+Closes: https://github.com/madzak/python-json-logger/pull/188
+---
+ src/pythonjsonlogger/jsonlogger.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/pythonjsonlogger/jsonlogger.py b/src/pythonjsonlogger/jsonlogger.py
+index e250c7e..a911478 100644
+--- a/src/pythonjsonlogger/jsonlogger.py
++++ b/src/pythonjsonlogger/jsonlogger.py
+@@ -6,6 +6,7 @@ import logging
+ import json
+ import re
+ from datetime import date, datetime, time, timezone
++import sys
+ import traceback
+ import importlib
+ 
+@@ -23,6 +24,12 @@ RESERVED_ATTRS: Tuple[str, ...] = (
+     'msecs', 'message', 'msg', 'name', 'pathname', 'process',
+     'processName', 'relativeCreated', 'stack_info', 'thread', 'threadName')
+ 
++if sys.version_info >= (3, 12):
++    RESERVED_ATTRS = (
++        *RESERVED_ATTRS,
++        "taskName",
++    )
++
+ 
+ 
+ def merge_record_extra(
+-- 
+2.45.2
+
diff --git a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch b/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch
new file mode 100644
index 000000000000..8421617783da
--- /dev/null
+++ b/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/test_jsonlogger.py b/tests/test_jsonlogger.py
+index af369d2..068e760 100644
+--- a/tests/test_jsonlogger.py
++++ b/tests/test_jsonlogger.py
+@@ -176,13 +176,17 @@ def test_json_default_encoder(self):
+                          "1900-01-01T00:00:00")
+ 
+     @unittest.mock.patch('time.time', return_value=1500000000.0)
+-    def test_json_default_encoder_with_timestamp(self, time_mock):
++    @unittest.mock.patch('time.time_ns', return_value=1500000000000000000)
++    def test_json_default_encoder_with_timestamp(self, time_ns_mock, time_mock):
+         fr = jsonlogger.JsonFormatter(timestamp=True)
+         self.log_handler.setFormatter(fr)
+ 
+         self.log.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)
+         log_json = json.loads(self.buffer.getvalue())
+         self.assertEqual(log_json.get("timestamp"), "2017-07-14T02:40:00+00:00")
+ 
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.7-r1.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..eebbd60da169
--- /dev/null
+++ b/dev-python/python-json-logger/python-json-logger-2.0.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Standard python logging to output log data as json objects"
+HOMEPAGE="
+	https://github.com/madzak/python-json-logger/
+	https://pypi.org/project/python-json-logger/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/madzak/python-json-logger/pull/188
+	"${FILESDIR}/${P}-py312.patch"
+	# https://github.com/madzak/python-json-logger/pull/192
+	"${FILESDIR}/${P}-py313.patch"
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}