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

Restrict protobuf to 4.* versions #9630

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Conversation

QMalcolm
Copy link
Contributor

resolves #9566

Problem

Protobuf v5 has breaking changes.

Solution

Restrict the protobuf dependency to one major version, 4, so that we don't have to patch over handling 2 different major versions of protobuf.

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

Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.
@QMalcolm QMalcolm requested a review from a team as a code owner February 22, 2024 18:32
@QMalcolm QMalcolm requested a review from gshank February 22, 2024 18:32
@cla-bot cla-bot bot added the cla:yes label Feb 22, 2024
Copy link

codecov bot commented Feb 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.95%. Comparing base (7df747a) to head (0f01493).
Report is 23 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9630      +/-   ##
==========================================
+ Coverage   88.00%   88.95%   +0.95%     
==========================================
  Files         176      178       +2     
  Lines       22311    24319    +2008     
==========================================
+ Hits        19634    21633    +1999     
- Misses       2677     2686       +9     
Flag Coverage Δ
integration 86.66% <ø> (+1.06%) ⬆️
unit 63.32% <ø> (+1.22%) ⬆️

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
Copy link
Contributor

gshank commented Feb 22, 2024

There's already a pull request: #9614

@QMalcolm
Copy link
Contributor Author

There's already a pull request: #9614

Woops

@QMalcolm QMalcolm closed this Feb 22, 2024
@QMalcolm
Copy link
Contributor Author

Reopening because #9614 only did the dev-requirements.txt

@QMalcolm QMalcolm reopened this Feb 29, 2024
@QMalcolm QMalcolm merged commit e4fe839 into main Feb 29, 2024
111 of 113 checks passed
@QMalcolm QMalcolm deleted the qmalcolm--9566-cap-protobuf-version branch February 29, 2024 17:19
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-9630-to-1.5.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e4fe839e4574187b574473596a471092267a9f2e
# Push it to GitHub
git push --set-upstream origin backport-9630-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-9630-to-1.5.latest.

github-actions bot pushed a commit that referenced this pull request Feb 29, 2024
Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.

(cherry picked from commit e4fe839)
github-actions bot pushed a commit that referenced this pull request Feb 29, 2024
Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.

(cherry picked from commit e4fe839)
@dbt-labs dbt-labs deleted a comment from github-actions bot Feb 29, 2024
QMalcolm added a commit that referenced this pull request Feb 29, 2024
Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.
QMalcolm added a commit that referenced this pull request Feb 29, 2024
Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.
QMalcolm added a commit that referenced this pull request Feb 29, 2024
* Restrict protobuf to 4.* versions (#9630)

Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.

(cherry picked from commit e4fe839)

---------

Co-authored-by: Quigley Malcolm <[email protected]>
Co-authored-by: Quigley Malcolm <[email protected]>
QMalcolm added a commit that referenced this pull request Mar 11, 2024
* Restrict protobuf to 4.* versions (#9630)

Protobuf v5 has breaking changes. Here we are limiting the protobuf
dependency to one major version, 4, so that we don't have to patch
over handling 2 different major versions of protobuf.

(cherry picked from commit e4fe839)

---------

Co-authored-by: Quigley Malcolm <[email protected]>
Co-authored-by: Quigley Malcolm <[email protected]>
@urkle
Copy link

urkle commented Mar 13, 2024

Is it possible to get a 1.7.10 hot-fix release out that JUST has this dependency change in it? As google released their new protobuf package an hour ago and now our automation is completely broken.

@gshank
Copy link
Contributor

gshank commented Mar 13, 2024

1.7.10 is going out tomorrow

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
4 participants