gentoo auto-resync : 27:02:2025 - 19:26:39

6 files changed, 2 insertions, 138 deletions

diff --git a/dev-python/python-json-logger/Manifest b/dev-python/python-json-logger/Manifest
index 01215c34aa0f..daeac744bc5b 100644
--- a/dev-python/python-json-logger/Manifest
+++ b/dev-python/python-json-logger/Manifest
@@ -1,9 +1,3 @@
-AUX python-json-logger-2.0.7-py312.patch 1072 BLAKE2B 4b1409028046ed0b0ed41a221f8cc5957103fdb84c68037bea2b33a16e17e40814d44839b51a16bf122ed82b2ab9dce191850be8df7590a0581af270ab74a8ac SHA512 1497285bb76ec96d6d3a3316e8c03833dc78655add76f382331acfbb0a0d2b2e5a17f2bf596352dba39d3f6c44b0351144680e61e6361002a905db7e79b1c46b
-AUX python-json-logger-2.0.7-py313.patch 1037 BLAKE2B 7f060bbb3ed61a7504b665c2412f46d7853729c6bd8550a5fa4c0311585e8283d58f2c1776e892af1cc6bfaa9937db7933e4c4b5d675f3b75842c618e53f5af6 SHA512 78e67dc60f7bf4c00dfbb34daf5c0eab9af8063c69872974cab62d82f0c7cd1eafe3e32424fe836cd63688d241a5c65e369f757f0690529b47e8ecabbc0214f5
-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
-EBUILD python-json-logger-2.0.7-r1.ebuild 808 BLAKE2B 94178c37db913496775db050707247180384ebe54d7044b41b5dd272c49f7c81a220d2653109762a6837e6a066f42d21a3a270783d37d8f2c73c16b10ba45dd8 SHA512 7278c9add55fa72a0dff9cd60490926503d19a402fb32b203fc70c21d3fdc34d87ad919ee07376d8eba429d289e4b9e64288c3f5a319253dac8295585209033e
-EBUILD python-json-logger-3.2.0.ebuild 709 BLAKE2B c807bcbb1b138046bb6cf554438b4ecd11b749c60cf0821d8311b3fa41db911ac00b14e2a6da1db777c0122d5978ad8fa8eef663c3710934a8029d46add27dec SHA512 8c98207ecf0125022220f01b48dfa353638581f47a05908ee2ae12e42c1a81b1f234b301c82832f62c10043b12ce823199b05238821f3a156c3c104b478e1856
-EBUILD python-json-logger-3.2.1.ebuild 711 BLAKE2B bed7a02c0f814599fa403f0fbc62052cc0d727545c455010e6fad79328c9b85ccc6ccad934b022f84b5ffe9352f0a593a5eb346c083f0d3a3cd87cc131d7860e SHA512 5293d16df0bb9f1af25ff52b0cebbce175876207c3bd81643f003e0505b4c11f50523e1e61e2ac7fb40a390e73d4346f0371b61f67b531c9b0b12868e4ecbad9
+EBUILD python-json-logger-3.2.1.ebuild 710 BLAKE2B a92357d8ebda86a9831e22a8a13bd5bb82531b491d10722d06a032070d1a3022fca7203beecc6dbc4dce5cb5d151986edb3151b55afb24d5bb4c207cd622d573 SHA512 45be515e8dfd3e7cd78780cb1431ec7d827319ac481cb09f48c334cb4242fd5b7fe32cdfe4ec630b858efd5e07c669f015978713c98131d031478ce775d994d6
 MISC metadata.xml 649 BLAKE2B 08ae72a3035d22e511be62554fb1bac5a7bd9b450a557d7eadf21ac3061f8ed97a6fae7980b9c0fecc85cd36e9733f71a723e694812a27a1248c6dac37033a68 SHA512 476d71374f5c6d13bdaac2d0a7713943dca9273afe6d598e289f7eea57bd0c73f2e149f62889c99e885b880ce965205d2eae5a9bb6577693fce672b2031d6359
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
deleted file mode 100644
index 1cab3b851ff6..000000000000
--- a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch
+++ /dev/null
@@ -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
-
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
deleted file mode 100644
index 8421617783da..000000000000
--- a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch
+++ /dev/null
@@ -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")
- 
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
deleted file mode 100644
index 1196fbf29b12..000000000000
--- a/dev-python/python-json-logger/python-json-logger-2.0.7-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-python/python-json-logger/python-json-logger-3.2.0.ebuild b/dev-python/python-json-logger/python-json-logger-3.2.0.ebuild
deleted file mode 100644
index 2b11127f7179..000000000000
--- a/dev-python/python-json-logger/python-json-logger-3.2.0.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild b/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild
index 3ebee9178ab9..770c5c65bf61 100644
--- a/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (