Allow using protobuf version 5 and later #6683
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maffoo
requested review from
wcourtney,
vtomole,
verult and
a team
as code owners
pavoljuhas
reviewed
Jul 31, 2024
| @@ -35,6 +37,15 @@ | |||
| from cirq.qis import CliffordTableau | |||
|
|
|||
|
|
|||
| def _json_format_kwargs() -> Dict[str, bool]: | |||
There was a problem hiding this comment.
Can you add a TODO comment to delete this once we require protobuf>=5?
pavoljuhas
approved these changes
Jul 31, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6683 +/- ##
==========================================
- Coverage 97.82% 97.82% -0.01%
==========================================
Files 1074 1074
Lines 92118 92126 +8
==========================================
+ Hits 90116 90120 +4
- Misses 2002 2006 +4 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6651
I've updated
arg_func_lang_test.pyto pass the new or old kwarg tojson_format.MessageToDictbased on inspecting the function signature, so it works with old and new versions of protobuf. This will unblock upgrades that we need to do internally to work with python 3.12.