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.

Sign up for GitHub

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

Jump to bottom

fix: Add compatibility with protobuf==5.x #433

Merged
merged 44 commits into from
Jun 4, 2024
Merged

fix: Add compatibility with protobuf==5.x #433

merged 44 commits into from
Jun 4, 2024

Conversation

parthea
Copy link
Contributor

@parthea parthea commented Feb 13, 2024 •
edited
Loading

BEGIN_COMMIT_OVERRIDE
feat: Add always_print_fields_with_no_presence fields to to_json and to_dict
docs: Deprecate field including_default_value_fields in to_json and to_dict
fix: Add compatibility with protobuf==5.x
fix: AttributeError module 'google._upb._message' has no attribute 'MessageMapContainer'
ci: Add support for pre-release sessions
ci: Add python 3.13 to testing matrix
ci: Resolve RecursionError: maximum recursion depth exceeded while calling a Python object when running tests
END_COMMIT_OVERRIDE

Fixes #425
Fixes #427
Fixes #431
Fixes #445

For compatibility with https://pypi.org/project/protobuf/5.26.0rc2/

See protocolbuffers/protobuf@2699579

@parthea parthea force-pushed the add-protobuf-5-compatibility branch 10 times, most recently from 8ea8426 to 39e4d33 Compare February 13, 2024 23:56
@parthea parthea changed the title ci: add support for pre-release sessions fix: compatibility with protobuf==5.26.0rc2 Feb 13, 2024
@parthea parthea force-pushed the add-protobuf-5-compatibility branch from 39e4d33 to 62b37ee Compare February 13, 2024 23:59
@parthea parthea changed the title fix: compatibility with protobuf==5.26.0rc2 fix: Fix compatibility with protobuf==5.26.0rc2 Feb 14, 2024
@parthea parthea force-pushed the add-protobuf-5-compatibility branch 2 times, most recently from 259b2a4 to 19c487f Compare February 14, 2024 15:10
@parthea parthea mentioned this pull request Feb 14, 2024
Closed
@parthea parthea marked this pull request as ready for review February 14, 2024 15:11
@parthea parthea requested a review from a team as a code owner February 14, 2024 15:11
@parthea parthea mentioned this pull request Feb 14, 2024
Closed
@parthea parthea added the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 14, 2024
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 14, 2024
@parthea parthea mentioned this pull request Feb 14, 2024
Closed
@parthea parthea marked this pull request as draft February 20, 2024 19:16
@parthea parthea mentioned this pull request Mar 19, 2024
Closed
vchudnov-g
vchudnov-g reviewed Mar 19, 2024
View reviewed changes
proto/message.py Outdated Show resolved Hide resolved
proto/message.py Outdated Show resolved Hide resolved
proto/message.py Show resolved Hide resolved
@parthea parthea changed the title fix: Fix compatibility with protobuf==5.26.0rc2 fix: Fix compatibility with protobuf==5.x Apr 19, 2024
@parthea
Copy link
Contributor Author

parthea commented Apr 19, 2024 •
edited
Loading

The pre-release failure in https://github.com/googleapis/proto-plus-python/actions/runs/8758049270/job/24037997447 is captured in #444

@parthea parthea changed the title fix: Fix compatibility with protobuf==5.x fix!: Add compatibility with protobuf==5.x Apr 19, 2024
@parthea parthea marked this pull request as ready for review May 30, 2024 17:25
@parthea parthea requested a review from ohmayr May 30, 2024 17:25
@parthea
Copy link
Contributor Author

parthea commented May 30, 2024

@vchudnov-g @ohmayr PTAL

vchudnov-g
vchudnov-g reviewed May 30, 2024
View reviewed changes
.github/workflows/tests.yml Show resolved Hide resolved
noxfile.py Outdated Show resolved Hide resolved
noxfile.py Outdated Show resolved Hide resolved
noxfile.py Outdated Show resolved Hide resolved
proto/marshal/marshal.py Outdated Show resolved Hide resolved
tests/test_json.py Outdated Show resolved Hide resolved
tests/test_message.py Outdated Show resolved Hide resolved
tests/test_json.py Show resolved Hide resolved
tests/test_json.py Show resolved Hide resolved
proto/marshal/compat.py Show resolved Hide resolved
vchudnov-g
vchudnov-g approved these changes May 31, 2024
View reviewed changes
Copy link
Contributor

@vchudnov-g vchudnov-g left a comment

Choose a reason for hiding this comment

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

Looks good. Left two minor comments, but I think we're good to go.,

tests/test_json.py Show resolved Hide resolved
tests/test_json.py Show resolved Hide resolved
tests/test_message.py Show resolved Hide resolved
tests/test_message.py Outdated Show resolved Hide resolved
parthea and others added 2 commits June 4, 2024 10:46
@parthea
add test case
9d85d8b
@parthea @vchudnov-g
Update tests/test_message.py
3b6228b 
Co-authored-by: Victor Chudnovsky <vchudnov@google.com>
@parthea parthea merged commit 0f89372 into main Jun 4, 2024
32 checks passed
@parthea parthea deleted the add-protobuf-5-compatibility branch June 4, 2024 11:01
@deannagarcia deannagarcia mentioned this pull request Jun 4, 2024
Open
@parthea parthea mentioned this pull request Jul 11, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vchudnov-g vchudnov-g vchudnov-g approved these changes

@ohmayr ohmayr Awaiting requested review from ohmayr

Assignees

@vchudnov-g vchudnov-g

@ohmayr ohmayr

Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@parthea @vchudnov-g @ohmayr