Update six version to 1.12.0 and fix legacy_create_init issue#6391
Merged
acozzette merged 3 commits intoprotocolbuffers:masterfrom Aug 15, 2019
Merged
Update six version to 1.12.0 and fix legacy_create_init issue#6391acozzette merged 3 commits intoprotocolbuffers:masterfrom
acozzette merged 3 commits intoprotocolbuffers:masterfrom
Conversation
aaliddell
referenced
this pull request
Jul 16, 2019
* Fix reference to six in //:protobuf_python rule * Add six to protobuf_deps.bzl * Use six archive directly as repo @six
Contributor
|
Hey, any updates on this? The protobuf project on Bazel CI is still broken, so we won't know if Bazel can still build protobuf. |
Yannic
reviewed
Aug 7, 2019
|
@aaliddell Thank you for fixing this. Could you merge master (or rebase) again? It looks like the CI tests won't run if the PR can't be merged automatically. |
When the @six//:six library is used on a target without the `legacy_create_init` flag disabled, the library will not be usable due to __init__.py being empty and the six code will be in six.py. This change forces six to occupy the __init__ name, preventing this file getting created regardless of the `legacy_create_init` setting. See comments on a74c43b for context: protocolbuffers@a74c43b
Archive is declared in the protobuf_deps() call above
Contributor
Author
|
Rebase done |
Contributor
Author
|
The test failures again do not look related to the changes in this PR |
Yannic
added a commit
to Yannic/rules_proto_bazelbuild
that referenced
this pull request
Aug 19, 2019
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
When the @six//:six library is used on a target without the
legacy_create_initflag disabled, the library will not be usable due to init.py being empty and the six code will be in six.py. This change forces six to occupy the init name, preventing this file getting created regardless of thelegacy_create_initsetting.See comments on a74c43b for context.