Skip to content

Update proto stubs with latest mypy-protobuf 2.6 #5753

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
Jul 11, 2021

Conversation

nipunn1313
Copy link
Contributor

Updated protobuf version and mypy-protobuf version for newly updated stubs.
All updated stubs were autogenerated by scripts/generate_proto_stubs.sh

@srittau
Copy link
Collaborator

srittau commented Jul 10, 2021

Could you please also update the version in the METADATA.toml file?

@Akuli
Copy link
Collaborator

Akuli commented Jul 10, 2021

Should we cherry-pick changes that were made manually?

@nipunn1313
Copy link
Contributor Author

nipunn1313 commented Jul 10, 2021

Could you please also update the version in the METADATA.toml file?

Yep! on it

Should we cherry-pick changes that were made manually?

Let me look through them. I think there's no need.

git log -p HEAD^ -- stubs/protobuf/**/*_pb2.pyi
git log -p -- "third_party/2and3/google/protobuf/**/*_pb2.pyi"

#5597 - looks like pyright is passing here. The improved mypy-protobuf seems to have made these changes.
#4971 - just reorganized dir structure for stubs
#5252 - ran black, but the generation script already runs black - and tests pass here, so no problem
#4850 - was the last update of mypy-protobuf pin

@nipunn1313 nipunn1313 force-pushed the update_proto_stubs branch from 7714a3d to a850d8e Compare July 10, 2021 16:30
@nipunn1313
Copy link
Contributor Author

ah - my git command missed things. Trying again with

git log -p -- "third_party/2and3/google/**/*_pb2.pyi"

Also came across
#4907 - which has since been fixed upstream in mypy-protobuf

That should be comprehensive audit of the cherry-picks. I don't think they're needed any more (all the better!)

@nipunn1313 nipunn1313 force-pushed the update_proto_stubs branch 2 times, most recently from 3420b56 to d8c1375 Compare July 10, 2021 16:41
@nipunn1313 nipunn1313 force-pushed the update_proto_stubs branch from d8c1375 to ceafd47 Compare July 10, 2021 16:50
@JelleZijlstra JelleZijlstra merged commit 42eec29 into python:master Jul 11, 2021
@nipunn1313 nipunn1313 deleted the update_proto_stubs branch July 16, 2021 20:16
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