Integrate from Piper for C++, Java, and Python #7845
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
acozzette
reviewed
Aug 25, 2020
python/setup.py
Outdated
| @@ -292,7 +292,6 @@ def get_option_from_sys_argv(option_str): | |||
| 'build_py': build_py, | |||
| 'test_conformance': test_conformance, | |||
| }, | |||
| setup_requires = ['wheel'], | |||
There was a problem hiding this comment.
I just added this line recently, so I think something must be wrong if it's getting removed again.
There was a problem hiding this comment.
Thanks for catching that, fixed.
There was one other small change that was somehow lost in the last integrate back to Piper. I'll keep a closer eye on the next integrate to Piper.
acozzette
approved these changes
Aug 25, 2020
vesavlad
pushed a commit
to vesavlad/protobuf
that referenced
this pull request
Sep 22, 2020
Integrate from Piper for C++, Java, and Python
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.
Important: this integration must be merged, not squashed!