Skip to content

Commit d267342

Browse files
authored
fix: require Protobuf 6.33.5+ (#17743)
Towards b/420641246 This PR is similar to #17349 for the generator/auto-generated code. The minimum versions of google-api-core and proto-plus and others also need to be versions that support Protobuf 6 https://github.com/googleapis/python-api-core/releases/tag/v2.24.2 https://github.com/googleapis/proto-plus-python/releases/tag/v1.26.1 Also see the client library versions which allow Protobuf 6.x in PR #13644 (https://github.com/googleapis/google-cloud-python/blob/release-please--branches--main--release-notes/release-notes.md) Once this PR is merged, I will update `protoc` here to `33.5` so we can update `gencode`: https://github.com/googleapis/librarian/blob/fa34184d746948b1da7df000ffcf832979a3c488/cmd/librarian/Dockerfile#L49
1 parent e15c21d commit d267342

64 files changed

Lines changed: 139 additions & 282 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/gapic-generator-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
SHOWCASE_VERSION: 0.35.0
17-
PROTOC_VERSION: 3.20.2
17+
PROTOC_VERSION: 33.5
1818
LATEST_STABLE_PYTHON: 3.14
1919
PRERELEASE_PYTHON: 3.15
2020
ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14', '3.15']"

.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ replacements:
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33-
"google-cloud-common >= 1.0.0, <2.0.0",
33+
"google-cloud-common >= 1.5.1, <2.0.0",
3434
"grpcio >= 1.59.0, < 2.0.0",
3535
count: 1

.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ replacements:
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33-
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
33+
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
3434
"grpcio >= 1.59.0, < 2.0.0",
3535
count: 1
3636
- paths: [
@@ -49,7 +49,7 @@ replacements:
4949
# Exclude incompatible versions of `google-auth`
5050
# See https://github.com/googleapis/google-cloud-python/issues/12364
5151
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
52-
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
52+
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
5353
"grpcio >= 1.59.0, < 2.0.0",
5454
count: 1
5555
- paths: [
@@ -68,7 +68,7 @@ replacements:
6868
# Exclude incompatible versions of `google-auth`
6969
# See https://github.com/googleapis/google-cloud-python/issues/12364
7070
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
71-
"grafeas >= 1.7.0, <2.0",
71+
"grafeas >= 1.14.1, <2.0",
7272
"grpcio >= 1.59.0, < 2.0.0",
7373
count: 1
7474
- paths: [
@@ -87,7 +87,7 @@ replacements:
8787
# Exclude incompatible versions of `google-auth`
8888
# See https://github.com/googleapis/google-cloud-python/issues/12364
8989
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
90-
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
90+
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
9191
"grpcio >= 1.59.0, < 2.0.0",
9292
count: 1
9393
- paths: [

.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ replacements:
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
33-
"grafeas >=1.7.0, <2.0",
33+
"grafeas >=1.14.1, <2.0",
3434
"grpcio >= 1.59.0, < 2.0.0",
3535
count: 1
3636
- paths: [

.librarian/generator-input/client-post-processing/logging-integration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ replacements:
4141
"grpcio >= 1.59.0, < 2.0.0",
4242
after: |
4343
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
44-
"google-cloud-appengine-logging>=0.1.3, <2.0.0",
44+
"google-cloud-appengine-logging>=1.6.1, <2.0.0",
4545
"google-cloud-audit-log >= 0.3.2, < 1.0.0",
4646
"google-cloud-core >= 2.0.0, <3.0.0",
4747
"grpc-google-iam-v1 >=0.14.2, <1.0.0",
@@ -56,7 +56,7 @@ replacements:
5656
grpcio==1.59.0
5757
after: |
5858
google-auth==2.14.1
59-
google-cloud-appengine-logging==0.1.3
59+
google-cloud-appengine-logging==1.6.1
6060
google-cloud-audit-log==0.3.2
6161
google-cloud-core==2.0.0
6262
grpc-google-iam-v1==0.14.2

.librarian/generator-input/client-post-processing/storage-integration.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -601,12 +601,11 @@ replacements:
601601
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
602602
"grpcio-status >= 1.59.0, < 2.0.0",
603603
"grpcio-status >= 1.75.1, < 2.0.0; python_version >= '3.14'",
604-
"proto-plus >= 1.22.3, <2.0.0; python_version < '3.13'",
605-
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
606-
"protobuf >= 4.25.8, < 8.0.0",
607-
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
604+
"proto-plus >= 1.26.1, <2.0.0",
605+
"protobuf >= 6.33.5, < 8.0.0",
606+
"grpc-google-iam-v1 >= 0.14.2, <1.0.0",
608607
],
609-
"protobuf": ["protobuf >= 3.20.2, < 7.0.0"],
608+
"protobuf": ["protobuf >= 6.33.5, < 8.0.0"],
610609
"tracing": [
611610
"opentelemetry-api >= 1.1.0, < 2.0.0",
612611
],
@@ -655,9 +654,9 @@ replacements:
655654
google-resumable-media==2.7.2
656655
grpcio==1.59.0
657656
grpcio-status==1.59.0
658-
proto-plus==1.22.3
659-
protobuf==4.25.8
660-
grpc-google-iam-v1==0.14.0
657+
proto-plus==1.26.1
658+
protobuf==6.33.5
659+
grpc-google-iam-v1==0.14.2
661660
opentelemetry-api==1.1.0
662661
requests==2.22.0
663662
google-crc32c==1.6.0

packages/bigframes/setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"google-cloud-bigquery[bqstorage,pandas] >=3.36.0",
4343
# 2.30 needed for arrow support.
4444
"google-cloud-bigquery-storage >= 2.30.0, < 3.0.0",
45-
"google-cloud-functions >=1.12.0",
46-
"google-cloud-bigquery-connection >=1.12.0",
47-
"google-cloud-resource-manager >=1.10.3",
45+
"google-cloud-functions >=1.20.2",
46+
"google-cloud-bigquery-connection >=1.18.2",
47+
"google-cloud-resource-manager >=1.14.2",
4848
"google-cloud-storage >=2.0.0",
4949
"google-crc32c >=1.0.0,<2.0.0",
5050
"grpc-google-iam-v1 >= 0.14.2",
@@ -73,8 +73,8 @@
7373
"tests": [
7474
"freezegun",
7575
"pytest-snapshot",
76-
"google-cloud-bigtable >=2.24.0",
77-
"google-cloud-pubsub >=2.21.4",
76+
"google-cloud-bigtable >=2.30.0",
77+
"google-cloud-pubsub >=2.29.0",
7878
"tzdata",
7979
],
8080
# used for local engine

packages/bigframes/testing/constraints-3.10.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ fsspec==2023.3.0
44
gcsfs==2023.3.0
55
geopandas==0.12.2
66
google-auth==2.15.0
7-
google-cloud-bigtable==2.24.0
8-
google-cloud-pubsub==2.21.4
7+
google-cloud-bigtable==2.30.0
8+
google-cloud-pubsub==2.29.0
99
google-cloud-bigquery==3.36.0
10-
google-cloud-functions==1.12.0
11-
google-cloud-bigquery-connection==1.12.0
12-
google-cloud-iam==2.12.1
13-
google-cloud-resource-manager==1.10.3
10+
google-cloud-functions==1.20.2
11+
google-cloud-bigquery-connection==1.18.2
12+
google-cloud-iam==2.18.2
13+
google-cloud-resource-manager==1.14.2
1414
google-cloud-storage==2.0.0
1515
grpc-google-iam-v1==0.14.2
1616
numpy==1.24.0
@@ -95,7 +95,7 @@ pluggy==1.6.0
9595
prompt_toolkit==3.0.52
9696
propcache==0.4.1
9797
proto-plus==1.27.1
98-
protobuf==4.25.8
98+
protobuf==6.33.5
9999
psygnal==0.15.1
100100
ptyprocess==0.7.0
101101
pure_eval==0.2.3

packages/bigframes/testing/constraints-3.11.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ gitdb==4.0.12
145145
GitPython==3.1.45
146146
glob2==0.7
147147
google==2.0.3
148-
google-ai-generativelanguage==0.6.15
148+
google-ai-generativelanguage==0.6.17
149149
google-api-core==2.25.1
150150
google-api-python-client==2.177.0
151151
google-auth==2.38.0
@@ -180,7 +180,7 @@ groovy==0.1.2
180180
grpc-google-iam-v1==0.14.2
181181
grpc-interceptor==0.15.4
182182
grpcio==1.74.0
183-
grpcio-status==1.71.2
183+
grpcio-status==1.72.1
184184
grpclib==0.4.8
185185
gspread==6.2.1
186186
gspread-dataframe==4.0.0
@@ -401,7 +401,7 @@ prompt_toolkit==3.0.51
401401
propcache==0.3.2
402402
prophet==1.1.7
403403
proto-plus==1.26.1
404-
protobuf==5.29.5
404+
protobuf==6.33.5
405405
psutil==5.9.5
406406
psycopg2==2.9.10
407407
psygnal==0.14.0

packages/bigquery-magics/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# moved back to optional due to bloat. See
4646
# https://github.com/googleapis/python-bigquery/issues/1196 for more background.
4747
"bqstorage": [
48-
"google-cloud-bigquery-storage >= 2.25.0, <3.0.0",
48+
"google-cloud-bigquery-storage >= 2.29.0, <3.0.0",
4949
# Due to an issue in pip's dependency resolver, the `grpc` extra is not
5050
# installed, even though `google-cloud-bigquery-storage` specifies it
5151
# as `google-api-core[grpc]`. We thus need to explicitly specify it here.

0 commit comments

Comments
 (0)