Skip to content

Sort the list of sources in generated file headers #164

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

Merged
merged 2 commits into from
Apr 1, 2021
Merged

Conversation

nat-n
Copy link
Collaborator

@nat-n nat-n commented Oct 19, 2020

This is done on top of #161 so that the changes combine properly, but the two could easily be rebased for a different merge order.

@nat-n nat-n requested review from cetanu and danielgtaylor October 23, 2020 13:29
cetanu
cetanu previously approved these changes Oct 23, 2020
@nat-n nat-n added the enhancement New feature or request label Nov 25, 2020
@nat-n nat-n mentioned this pull request Dec 8, 2020
@nat-n nat-n force-pushed the use_betterproto branch from 2ea7e44 to 6f1754e Compare March 31, 2021 21:48
Base automatically changed from use_betterproto to master March 31, 2021 22:49
@cetanu cetanu dismissed their stale review March 31, 2021 22:49

The base branch was changed.

This means the betterproto plugin no longer needs to depend durectly on
protobuf.

This requires a small runtime hack to monkey patch some google types to
get around the fact that the compiler uses proto2, but betterproto
expects proto3.

Also:
- regenerate google.protobuf package
- fix a regex bug in the logic for determining whether to use a google
  wrapper type.
- fix a bug causing comments to get mixed up when multiple proto files
  generate code into a single python module
@nat-n nat-n requested a review from cetanu April 1, 2021 18:50
@nat-n
Copy link
Collaborator Author

nat-n commented Apr 1, 2021

Rebased, ready for approval. Should be OK to merge after #162 without rebasing again.

@cetanu cetanu merged commit fc90653 into master Apr 1, 2021
@cetanu cetanu deleted the sort_sources branch April 1, 2021 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants