From afbc7e42a5555601112aa01e64964e481f293758 Mon Sep 17 00:00:00 2001 From: Gerda Shank Date: Mon, 4 Nov 2024 10:53:53 -0500 Subject: [PATCH 1/4] Use protobuf >=5.0,<=6.0 --- core/setup.py | 2 +- dev-requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/setup.py b/core/setup.py index c2ad0b58f83..ee155a0b5a1 100644 --- a/core/setup.py +++ b/core/setup.py @@ -57,7 +57,7 @@ # with major versions in each new minor version of dbt-core. "click>=8.0.2,<9.0", "networkx>=2.3,<4.0", - "protobuf>=4.0.0,<5", + "protobuf>=5.0,<6.0" "requests<3.0.0", # should match dbt-common "snowplow-tracker>=1.0.2,<2.0", # ---- diff --git a/dev-requirements.txt b/dev-requirements.txt index 20605e632b8..e0d6ff7a800 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ git+https://github.com/dbt-labs/dbt-adapters.git@main git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter -git+https://github.com/dbt-labs/dbt-common.git@main +git+https://github.com/dbt-labs/dbt-common.git@upgrade_protobuf_to_5.27 git+https://github.com/dbt-labs/dbt-postgres.git@main # black must match what's in .pre-commit-config.yaml to be sure local env matches CI black==24.3.0 @@ -32,7 +32,7 @@ types-docutils types-PyYAML types-Jinja2 types-mock -types-protobuf>=4.0.0,<5.0.0 +types-protobuf>=5.0,<6.0 types-pytz types-requests types-setuptools From 3f02208c145922a7d883f82ad90701a81137581e Mon Sep 17 00:00:00 2001 From: Gerda Shank Date: Mon, 4 Nov 2024 11:05:15 -0500 Subject: [PATCH 2/4] Changie --- .changes/unreleased/Under the Hood-20241104-110509.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/unreleased/Under the Hood-20241104-110509.yaml diff --git a/.changes/unreleased/Under the Hood-20241104-110509.yaml b/.changes/unreleased/Under the Hood-20241104-110509.yaml new file mode 100644 index 00000000000..1036e073775 --- /dev/null +++ b/.changes/unreleased/Under the Hood-20241104-110509.yaml @@ -0,0 +1,6 @@ +kind: Under the Hood +body: Upgrade protobuf +time: 2024-11-04T11:05:09.433244-05:00 +custom: + Author: gshank + Issue: "10658" From 52a94416334a3313f4b03f7441a7d9095379d921 Mon Sep 17 00:00:00 2001 From: Gerda Shank Date: Mon, 4 Nov 2024 11:20:02 -0500 Subject: [PATCH 3/4] missing comma --- core/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/setup.py b/core/setup.py index ee155a0b5a1..412a1b2bfeb 100644 --- a/core/setup.py +++ b/core/setup.py @@ -57,7 +57,7 @@ # with major versions in each new minor version of dbt-core. "click>=8.0.2,<9.0", "networkx>=2.3,<4.0", - "protobuf>=5.0,<6.0" + "protobuf>=5.0,<6.0", "requests<3.0.0", # should match dbt-common "snowplow-tracker>=1.0.2,<2.0", # ---- From d3849015e9372d2f4c318e2236cd49b025bbcf90 Mon Sep 17 00:00:00 2001 From: Gerda Shank Date: Mon, 4 Nov 2024 11:36:18 -0500 Subject: [PATCH 4/4] Use dbt-adapters branch with protobuf version changed --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index e0d6ff7a800..1f313a8b361 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,4 @@ -git+https://github.com/dbt-labs/dbt-adapters.git@main +git+https://github.com/dbt-labs/dbt-adapters.git@upgrade_protobuf git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter git+https://github.com/dbt-labs/dbt-common.git@upgrade_protobuf_to_5.27 git+https://github.com/dbt-labs/dbt-postgres.git@main