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

feat: add initial files to allow protobuf 4.20 #327

Merged
merged 11 commits into from
Jul 1, 2022
Merged

Conversation

atulep
Copy link
Contributor

@atulep atulep commented Jun 24, 2022

BEGIN_COMMIT_OVERRIDE
feat: add initial files to allow protobuf 4.20
END_COMMIT_OVERRIDE

This PR integrates protobuf 4.xx into codebase.

@atulep atulep marked this pull request as ready for review June 28, 2022 23:31
@atulep atulep requested review from a team as code owners June 28, 2022 23:31
noxfile.py Outdated Show resolved Hide resolved
proto/marshal/collections/maps.py Outdated Show resolved Hide resolved
@parthea parthea added the owlbot:run Add this label to trigger the Owlbot post processor. label Jun 29, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Jun 29, 2022
@atulep atulep requested a review from vam-google June 29, 2022 21:09
proto/_package_info.py Show resolved Hide resolved
@@ -25,9 +25,17 @@
except ImportError:
_message = None

# Try UPB.
if not _message:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please test it more as we discussed. In case if ptotobuf 3.20 and 4.21 re mutually exclusive in this logic, please prioritize workflow, when newer version of protobuf if assumed first, and only if it fails, fallback to older version, not vice versa. This is to make sure that throwing an exception is not an expected behavior for the prioritized protobuf version (which I guess should be the new one)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

proto/message.py Outdated Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
@vam-google
Copy link
Contributor

@haberman can you please take a look at this PR?

atulep and others added 3 commits June 30, 2022 14:03
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
@atulep atulep requested a review from vam-google June 30, 2022 21:32
Copy link
Contributor

@vam-google vam-google left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@atulep atulep merged commit ed353aa into main Jul 1, 2022
@atulep atulep deleted the protobuf_migration branch July 1, 2022 23:52
@parthea parthea added the release-please:force-run To run release-please label Aug 10, 2022
@release-please release-please bot removed the release-please:force-run To run release-please label Aug 10, 2022
parthea added a commit that referenced this pull request Aug 10, 2022
parthea added a commit that referenced this pull request Aug 10, 2022
parthea added a commit that referenced this pull request Aug 10, 2022
* chore(main): release 1.22.0

* add changelog for PR #327

* ci: fix docs build

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
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.

3 participants