From 63a4a7d74bcbc8c6b94e6b18e599ffc68c71b91c Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Wed, 10 Aug 2022 17:37:36 -0700 Subject: [PATCH] Bump pinned protobuf version PiperOrigin-RevId: 466825011 --- bazel/workspace_deps.bzl | 2 +- python/pb_unit_tests/descriptor_test_wrapper.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bazel/workspace_deps.bzl b/bazel/workspace_deps.bzl index e95dec07ef..02049195b2 100644 --- a/bazel/workspace_deps.bzl +++ b/bazel/workspace_deps.bzl @@ -24,7 +24,7 @@ def upb_deps(): _github_archive, name = "com_google_protobuf", repo = "https://github.com/protocolbuffers/protobuf", - commit = "3380463ff87873b1ed07b730c79d78477289d0cd", + commit = "5407aa62af5f8d71c344ef10877806232a137991", patches = ["//bazel:protobuf.patch"], ) diff --git a/python/pb_unit_tests/descriptor_test_wrapper.py b/python/pb_unit_tests/descriptor_test_wrapper.py index f4cd3e75b4..8b33899b70 100644 --- a/python/pb_unit_tests/descriptor_test_wrapper.py +++ b/python/pb_unit_tests/descriptor_test_wrapper.py @@ -26,15 +26,6 @@ from google.protobuf.internal.descriptor_test import * import unittest -# begin:github_only -# Our behavior here matches pure-Python, which does not allow -# foo.enum_values_by_name.get([]). We reject it because we return a true -# dict (like pure Python), which does not allow hashing by a list. -GeneratedDescriptorTest.testDescriptor.__unittest_expecting_failure__ = True -GeneratedDescriptorTest.testCppDescriptorContainer.__unittest_expecting_failure__ = True -GeneratedDescriptorTest.testServiceDescriptor.__unittest_expecting_failure__ = True -# end:github_only - # These fail because they attempt to add fields with conflicting JSON names. # We don't want to support this going forward. MakeDescriptorTest.testCamelcaseName.__unittest_expecting_failure__ = True