New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
deps: update protobuf to 3.14 #14253
Changes from 9 commits
5313dc7
919e1cd
18691fb
6e8acda
5a51bdc
2fe0b36
c113ef7
494314b
b34523b
0a1acbe
233b6d9
de32d28
7e73763
1b37116
8eab565
722db6d
dc33299
d961c83
f01d9f1
c8ef105
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,3 +21,17 @@ index efc3d8e7f..746ad4851 100644 | |
|
||
################################################################################ | ||
# Protobuf Runtime Library | ||
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py | ||
index 97ac28028..8b7585d9d 100644 | ||
--- a/python/google/protobuf/__init__.py | ||
+++ b/python/google/protobuf/__init__.py | ||
@@ -31,3 +31,9 @@ | ||
# Copyright 2007 Google Inc. All Rights Reserved. | ||
|
||
__version__ = '3.14.0' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to maintain a patch or can we get a change landed upstream to avoid this? CC @envoyproxy/dependency-shepherds There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Honestly, I don't quite understand what's the deal with google dependencies, python, and bazel. If someone who understands it better could pick it up, I'd appreciate it. I only see it at the level that this was there before, and it's gone, and it works with it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this is from protocolbuffers/protobuf@66e3562. @dlj-NaN do you know why that PR would have caused There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. One thing to keep in mind is that I can't update googleapis because some python rules are being removed (I need to find out why). So there's that. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK. I don't think any of our build experts has a much better grasp of the Python/Bazel/GoogleAPIs internals, I'd probably start from first principles debugging :( There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. protocolbuffers/protobuf@66e3562 gets pretty deep into the semantics of Python imports and different packaging. The interaction addressed by that commit is very tricky, and may be hidden by varying the order of imports. (I'm guessing the reason this appeared with a protobuf commit was exactly due to order of imports... The upshot is that there shouldn't be any files named Anyhow, some fixes might be:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Removing Over the past year we've gradually moved
Are you referring to Bazel rules in https://github.com/googleapis/googleapis or something else? I don't have much context here so I'm not sure it matters, but the google-cloud-* libraries get their copy of many commonly used protos ( There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure if this is related but I'm trying to land an update to how we process pip dependencies using the latest There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I opened an issue for further discussion #14412. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. pip handling changes with the latest |
||
+ | ||
+if __name__ != '__main__': | ||
+ try: | ||
+ __import__('pkg_resources').declare_namespace(__name__) | ||
+ except ImportError: | ||
+ __path__ = __import__('pkgutil').extend_path(__path__, __name__) |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1.15.6 is out but I can bump this in a follow up