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

Paw/restrict to protobuf 4 #9614

Merged
merged 3 commits into from
Feb 26, 2024
Merged

Paw/restrict to protobuf 4 #9614

merged 3 commits into from
Feb 26, 2024

Conversation

peterallenwebb
Copy link
Contributor

resolves #9566

Problem

Existing code is incompatible with upcoming protobuf 5, and there is no simple way to make it compatible with both 4 and 5.

Solution

Restrict protobuf version to <5.0.0

Checklist

  • I have read the contributing guide and understand what's expected of me
  • I have run this code in development and it appears to resolve the stated issue
  • This PR includes tests, or tests are not required/relevant for this PR
  • This PR has no interface changes (e.g. macros, cli, logs, json artifacts, config files, adapter interface, etc) or this PR has already received feedback and approval from Product or DX
  • This PR includes type annotations for new and modified functions

@peterallenwebb peterallenwebb requested a review from a team as a code owner February 21, 2024 15:55
@cla-bot cla-bot bot added the cla:yes label Feb 21, 2024
Copy link

codecov bot commented Feb 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.04%. Comparing base (2b23a03) to head (0361007).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9614      +/-   ##
==========================================
+ Coverage   88.01%   88.04%   +0.03%     
==========================================
  Files         177      177              
  Lines       22350    22350              
==========================================
+ Hits        19671    19678       +7     
+ Misses       2679     2672       -7     
Flag Coverage Δ
integration 85.56% <ø> (+0.09%) ⬆️
unit 62.13% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@gshank gshank mentioned this pull request Feb 22, 2024
5 tasks
Copy link
Contributor

@ChenyuLInx ChenyuLInx left a comment

Choose a reason for hiding this comment

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

Should we create a follow up ticket to update our code to make it compatible with protobuf 5.0? Assuming people might install dbt-core with other things which might require 5.0?

@QMalcolm
Copy link
Contributor

Should we create a follow up ticket to update our code to make it compatible with protobuf 5.0? Assuming people might install dbt-core with other things which might require 5.0?

We absolutely should

@QMalcolm QMalcolm merged commit 4b6c57c into main Feb 26, 2024
52 checks passed
@QMalcolm QMalcolm deleted the paw/restrict-to-protobuf-4 branch February 26, 2024 20:08
Copy link
Contributor

The backport to 1.7.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.7.latest 1.7.latest
# Navigate to the new working tree
cd .worktrees/backport-1.7.latest
# Create a new branch
git switch --create backport-9614-to-1.7.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4b6c57cede3b2f85ce096c81f7297fe4212861cb
# Push it to GitHub
git push --set-upstream origin backport-9614-to-1.7.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.7.latest

Then, create a pull request where the base branch is 1.7.latest and the compare/head branch is backport-9614-to-1.7.latest.

Copy link
Contributor

The backport to 1.6.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.6.latest 1.6.latest
# Navigate to the new working tree
cd .worktrees/backport-1.6.latest
# Create a new branch
git switch --create backport-9614-to-1.6.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4b6c57cede3b2f85ce096c81f7297fe4212861cb
# Push it to GitHub
git push --set-upstream origin backport-9614-to-1.6.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.6.latest

Then, create a pull request where the base branch is 1.6.latest and the compare/head branch is backport-9614-to-1.6.latest.

Copy link
Contributor

The backport to 1.5.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.5.latest 1.5.latest
# Navigate to the new working tree
cd .worktrees/backport-1.5.latest
# Create a new branch
git switch --create backport-9614-to-1.5.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4b6c57cede3b2f85ce096c81f7297fe4212861cb
# Push it to GitHub
git push --set-upstream origin backport-9614-to-1.5.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.5.latest

Then, create a pull request where the base branch is 1.5.latest and the compare/head branch is backport-9614-to-1.5.latest.

@akan72
Copy link

akan72 commented Mar 13, 2024

Should the restriction have also been applied elsewhere in addition to dev-requirements.txt?

Google just released protobuf==5.26.0 in the past hour and caused this issue #9759

edit: nvm I see that this was done in #9630

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Google protobuf 5 is incompatible
5 participants