Skip to content
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

fix(bazel/python): incompatible_enable_proto_toolchain_resolution #17078

Closed
wants to merge 1 commit into from

Conversation

alexeagle
Copy link
Collaborator

This was originally landed in bazelbuild/rules_python#1577 However the fork of py_proto_library brought to the protobuf repo was from an earlier commit: 8257c44 (cl/623401031 for googlers)
Thus the fix was lost. This PR simply cherry-picks that change.

This was originally landed in bazelbuild/rules_python#1577
However the fork of py_proto_library brought to the protobuf repo was from an earlier commit:
protocolbuffers@8257c44
(cl/623401031 for googlers)
Thus the fix was lost. This PR simply cherry-picks that change.
@mkruskal-google mkruskal-google added the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Jun 7, 2024
@github-actions github-actions bot removed the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Jun 7, 2024
@alexeagle
Copy link
Collaborator Author

Note, @mkruskal-google agrees that the one test failure here is a known flake.

TinyTinni pushed a commit to TinyTinni/protobuf that referenced this pull request Jun 15, 2024
…otocolbuffers#17078)

This was originally landed in bazelbuild/rules_python#1577 However the fork of py_proto_library brought to the protobuf repo was from an earlier commit: protocolbuffers@8257c44 (cl/623401031 for googlers)
Thus the fix was lost. This PR simply cherry-picks that change.

Closes protocolbuffers#17078

COPYBARA_INTEGRATE_REVIEW=protocolbuffers#17078 from alexeagle:py_proto_toolchain 226540e
PiperOrigin-RevId: 642123868
deannagarcia pushed a commit to deannagarcia/protobuf that referenced this pull request Jun 20, 2024
…otocolbuffers#17078)

This was originally landed in bazelbuild/rules_python#1577 However the fork of py_proto_library brought to the protobuf repo was from an earlier commit: protocolbuffers@8257c44 (cl/623401031 for googlers)
Thus the fix was lost. This PR simply cherry-picks that change.

Closes protocolbuffers#17078

COPYBARA_INTEGRATE_REVIEW=protocolbuffers#17078 from alexeagle:py_proto_toolchain 226540e
PiperOrigin-RevId: 642123868
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants