From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B2D91581C1 for ; Fri, 12 Jul 2024 09:12:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74BF42BC070; Fri, 12 Jul 2024 09:12:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 581C72BC070 for ; Fri, 12 Jul 2024 09:12:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E2C0343009 for ; Fri, 12 Jul 2024 09:12:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B52281DB7 for ; Fri, 12 Jul 2024 09:12:55 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1720775569.79b039b0dee6caa2ec126b239a2939530a4d5c31.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-json-logger/, dev-python/python-json-logger/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch dev-python/python-json-logger/python-json-logger-2.0.7-r1.ebuild X-VCS-Directories: dev-python/python-json-logger/ dev-python/python-json-logger/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 79b039b0dee6caa2ec126b239a2939530a4d5c31 X-VCS-Branch: master Date: Fri, 12 Jul 2024 09:12:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a84e825-466b-4dbd-9006-6ce225852c3b X-Archives-Hash: a80e51438dbc7b99e67a0426ca287132 commit: 79b039b0dee6caa2ec126b239a2939530a4d5c31 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 12 08:35:50 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 12 09:12:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b039b0 dev-python/python-json-logger: Enable py3.13 Signed-off-by: Michał Górny gentoo.org> .../files/python-json-logger-2.0.7-py313.patch | 25 ++++++++++++++++++++++ .../python-json-logger-2.0.7-r1.ebuild | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) 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 index c6a7e17d8626..f066b81d5d99 100644 --- 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 @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) inherit distutils-r1 pypi @@ -24,6 +24,8 @@ 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() {