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 869C015817D for ; Thu, 13 Jun 2024 04:53:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40ACCE2AC3; Thu, 13 Jun 2024 04:53:54 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0333BE2AC3 for ; Thu, 13 Jun 2024 04:53:53 +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 0D1D333BEBB for ; Thu, 13 Jun 2024 04:53:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 701EA1CCF for ; Thu, 13 Jun 2024 04:53:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718254380.de15b02f0b35c97ba57195624a582d191b038812.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/, dev-python/protobuf-python/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch dev-python/protobuf-python/protobuf-python-4.22.5.ebuild X-VCS-Directories: dev-python/protobuf-python/ dev-python/protobuf-python/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: de15b02f0b35c97ba57195624a582d191b038812 X-VCS-Branch: master Date: Thu, 13 Jun 2024 04:53:51 +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: bc4ce158-3a5e-4752-8524-51d26bff43e7 X-Archives-Hash: 601f2ee69da78ffb9bbc42ad39f6138a commit: de15b02f0b35c97ba57195624a582d191b038812 Author: Sam James gentoo org> AuthorDate: Thu Jun 13 04:52:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 13 04:53:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de15b02f dev-python/protobuf-python: fix tests Bug: https://bugs.gentoo.org/934062 Signed-off-by: Sam James gentoo.org> .../files/protobuf-python-4.22.5-python.patch | 21 +++++++++++++++++++++ .../protobuf-python/protobuf-python-4.22.5.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch b/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch new file mode 100644 index 000000000000..65cb22d5f653 --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch @@ -0,0 +1,21 @@ +See also https://github.com/protocolbuffers/protobuf/pull/9098 +--- a/google/protobuf/internal/json_format_test.py ++++ b/google/protobuf/internal/json_format_test.py +@@ -1060,7 +1060,7 @@ class JsonFormatTest(JsonFormatBase): + def testInvalidTimestamp(self): + message = json_format_proto3_pb2.TestTimestamp() + text = '{"value": "10000-01-01T00:00:00.00Z"}' +- self.assertRaisesRegexp( ++ self.assertRaisesRegex( + json_format.ParseError, 'Failed to parse value field: ' + 'time data \'10000-01-01T00:00:00\' does not match' + ' format \'%Y-%m-%dT%H:%M:%S\' at TestTimestamp.value.', +@@ -1097,7 +1097,7 @@ class JsonFormatTest(JsonFormatBase): + def testInvalidOneof(self): + message = json_format_proto3_pb2.TestOneof() + text = '{"oneofInt32Value": 1, "oneofStringValue": "2"}' +- self.assertRaisesRegexp( ++ self.assertRaisesRegex( + json_format.ParseError, 'Message type "proto3.TestOneof"' + ' should not have multiple "oneof_value" oneof fields at "TestOneof".', + json_format.Parse, text, message) diff --git a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild b/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild index 9cf2f3d4c74a..59b4f648ed71 100644 --- a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild +++ b/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild @@ -56,6 +56,7 @@ PARENT_PATCHES=( # Here for patches within "python/" subdirectory. PATCHES=( + "${FILESDIR}/${PN}-4.22.5-python.patch" ) python_prepare_all() {