Bump pinned protobuf version

PiperOrigin-RevId: 466825011
pull/13171/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent 3f4f7ab079
commit 63a4a7d74b
  1. 2
      bazel/workspace_deps.bzl
  2. 9
      python/pb_unit_tests/descriptor_test_wrapper.py

@ -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"],
)

@ -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

Loading…
Cancel
Save