mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 02:39:08 -07:00
dev-python/python-json-logger: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,3 +1 @@
|
||||
DIST python-json-logger-2.0.7.tar.gz 10508 BLAKE2B 818abaa8007db2226beb7e9f9b6326c4c59e11827c740496bfde491a495b8580b74c483b4bead58525942009ae84643758b8fec4dc0ba85e2c1c2deff2445bcf SHA512 a3056f6c07386410204e65d027504df49d890b5c4577a0460077bc698c9104ab8720d6db107153766611f4f22141c0b2b57dbdacba75a7078638945937922f5e
|
||||
DIST python_json_logger-3.2.0.tar.gz 16160 BLAKE2B 076eb8b5c54f47b774eb093ccc3ff9aabf453a57e841ff2d19670ef92fe3928f9820fb2edecf81b570dc08c5a9b0c073f78e6b4c6d1abdde1995f24d27852b74 SHA512 dcb819634e8ff5e694777f9386ee264bb3978d89ddc873aac5b51a7694e9cb78a3920881d6fa3832f6c94c9648fdec6c39d5d8c9b8cc00f7ed8fa0c2317d4221
|
||||
DIST python_json_logger-3.2.1.tar.gz 16287 BLAKE2B 7c25119202e8b1c98ef97a27670290151de0edbcf7b0d4b8aae733e379d53d0747df1306677c669d33d4b83259341b2ae74b322a578703e9268bc307d4cc2a65 SHA512 731ee10223c688602f1c89800cdd8f6045917239d796a08dd8317a210b98e02afb4d894c74d897675ad526112e46534570e78a8d3686b4c2009f2b4c41b925b2
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
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")
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
# 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_{10..13} 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 ~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
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..13} 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/freezegun[${PYTHON_USEDEP}]
|
||||
dev-python/tzdata[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_test() {
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
epytest
|
||||
}
|
||||
Reference in New Issue
Block a user