Skip to content

Commit 07ee6c7

Browse files
committed
fix: bump grpcio to 1.59.0
1 parent e128488 commit 07ee6c7

57 files changed

Lines changed: 112 additions & 205 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.

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@ replacements:
374374
- "packages/google-cloud-pubsub/setup.py"
375375
before: '([ \t]+)("grpc-google-iam-v1.*",\n)\]\nextras = \{\}'
376376
after: |-
377-
\g<1>\g<2>\g<1>"grpcio-status >= 1.51.3",
377+
\g<1>\g<2>\g<1>"grpcio-status >= 1.59.0",
378+
\g<1>"grpcio-status >= 1.75.1, < 2.0.0; python_version >= '3.14'",
378379
\g<1>"opentelemetry-api >= 1.27.0",
379380
\g<1>"opentelemetry-sdk >= 1.27.0",
380381
]
@@ -509,21 +510,7 @@ replacements:
509510
before: 'grpc-google-iam-v1==0\.14\.0\n(?!grpcio-status)'
510511
after: |-
511512
grpc-google-iam-v1==0.14.0
512-
grpcio-status==1.51.3
513+
grpcio-status==1.59.0
513514
opentelemetry-api==1.27.0
514515
opentelemetry-sdk==1.27.0
515516
count: 1
516-
517-
- paths:
518-
- "packages/google-cloud-pubsub/testing/constraints-3.10.txt"
519-
before: 'grpcio==1.59.0'
520-
after: 'grpcio==1.51.3'
521-
count: 1
522-
523-
- paths:
524-
- "packages/google-cloud-pubsub/setup.py"
525-
before: '([ \t]+)"grpcio >= [0-9\.]+, < 2\.0\.0",\n(?:[ \t]*)"grpcio >= 1\.75\.1, < 2\.0\.0; python_version >= ''3\.14''",\n'
526-
after: |-
527-
\g<1>"grpcio >= 1.51.3, < 2.0.0; python_version < '3.14'",
528-
\g<1>"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
529-
count: 1

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ replacements:
130130
# See https://github.com/googleapis/google-cloud-python/issues/12364
131131
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
132132
"google-cloud-core >= 2.0.0, < 3.0.0",
133-
"grpcio >= 1.49.1, < 2.0.0",
133+
"grpcio >= 1.59.0, < 2.0.0",
134134
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
135135
"grpc-google-iam-v1 >= 0.12.4, <1.0.0",
136136
"proto-plus >= 1.22.3, <2.0.0",
@@ -1390,6 +1390,7 @@ replacements:
13901390
protobuf==4.25.8
13911391
google-cloud-core==2.0.0
13921392
grpc-google-iam-v1==0.12.4
1393+
grpcio-status==1.59.0
13931394
sqlparse==0.4.4
13941395
grpc-interceptor==0.15.4
13951396
opentelemetry-api==1.22.0
@@ -1401,9 +1402,3 @@ replacements:
14011402
libcst==0.2.5
14021403
googleapis-common-protos==1.60.0
14031404
count: 1
1404-
- paths: [packages/google-cloud-spanner/testing/constraints-3.10.txt]
1405-
before: 'grpcio==1.59.0\n(?!grpcio-status)'
1406-
after: |
1407-
grpcio==1.49.1
1408-
grpcio-status==1.49.1
1409-
count: 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,9 @@ replacements:
597597
# experimental in this SDK. More info in b/465352227
598598
"grpc": [
599599
"google-api-core[grpc] >= 2.27.0, < 3.0.0",
600-
"grpcio >= 1.59.0, < 2.0.0; python_version < '3.14'",
600+
"grpcio >= 1.59.0, < 2.0.0",
601601
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
602-
"grpcio-status >= 1.59.0, < 2.0.0; python_version < '3.14'",
602+
"grpcio-status >= 1.59.0, < 2.0.0",
603603
"grpcio-status >= 1.75.1, < 2.0.0; python_version >= '3.14'",
604604
"proto-plus >= 1.22.3, <2.0.0; python_version < '3.13'",
605605
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",

packages/bigquery-magics/noxfile.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ def install_systemtest_dependencies(session, with_extras, *constraints):
279279
@nox.parametrize("with_extras", [True, False])
280280
def system(session, with_extras):
281281
"""Run the system test suite."""
282-
if session.python == "3.9":
283-
session.skip("Python 3.9 is not supported.")
284282

285283
constraints_path = str(
286284
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"

packages/bigquery-magics/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
# See: https://github.com/googleapis/python-bigquery/issues/83 The
5353
# grpc.Channel.close() method isn't added until 1.32.0.
5454
# https://github.com/grpc/grpc/pull/15254
55-
"grpcio >= 1.47.0, < 2.0.0",
56-
"grpcio >= 1.49.1, < 2.0.0; python_version >= '3.11' and python_version < '3.14'",
55+
"grpcio >= 1.59.0, < 2.0.0",
5756
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
5857
],
5958
"bigframes": ["bigframes >= 1.17.0"],

packages/gapic-generator/gapic/ads-templates/setup.py.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"google-api-core[grpc] >= 2.24.2, < 3.0.0",
3333
"google-auth >= 2.14.1, <3.0.0",
3434
"googleapis-common-protos >= 1.53.0",
35-
"grpcio >= 1.10.0",
35+
"grpcio >= 1.59.0",
3636
"proto-plus >= 1.26.1, <2.0.0",
3737
"protobuf >= 6.33.5, < 8.0.0",
3838
{% if api.requires_package(('google', 'iam', 'v1')) %}

packages/gapic-generator/noxfile.py

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

1515
# Helpful notes for local usage:
1616
# unset PYENV_VERSION
17-
# pyenv local 3.14.1 3.13.10 3.12.11 3.11.4 3.10.12 3.9.17
17+
# pyenv local 3.14.1 3.13.10 3.12.11 3.11.4 3.10.12
1818
# PIP_INDEX_URL=https://pypi.org/simple nox
1919

2020
from __future__ import absolute_import
@@ -44,7 +44,6 @@
4444
RUFF_EXCLUDES = "*golden*,*pb2.py,*pb2.pyi"
4545

4646
ALL_PYTHON = (
47-
"3.9",
4847
"3.10",
4948
"3.11",
5049
"3.12",
@@ -58,8 +57,6 @@
5857
@nox.session(python=ALL_PYTHON)
5958
def unit(session):
6059
"""Run the unit test suite."""
61-
if session.python == "3.9":
62-
session.skip("Skipping Python 3.9 unit tests temporarily.")
6360
session.install(
6461
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2478):
6562
# Temporarily pin coverage to 7.11.0

packages/gapic-generator/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"click >= 6.7",
3131
"google-api-core[grpc] >= 2.24.2, < 3.0.0",
3232
"googleapis-common-protos >= 1.55.0, < 2.0.0",
33-
"grpcio >= 1.24.3, < 2.0.0",
33+
"grpcio >= 1.59.0, < 2.0.0",
3434
# 2.11.0 is required which adds the `default` argument to `jinja-filters.map()`
3535
# https://jinja.palletsprojects.com/en/3.0.x/templates/#jinja-filters.map
3636
# https://jinja.palletsprojects.com/en/2.11.x/changelog/#version-2-11-0

packages/gcp-sphinx-docfx-yaml/docfx_yaml/markdown_utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,10 @@ def _merge_markdown_content(
307307
content before the base file content.
308308
"""
309309
try:
310-
with open(base_file, "r+") as base, open(
311-
additional_content_file, "r"
312-
) as additional_content:
310+
with (
311+
open(base_file, "r+") as base,
312+
open(additional_content_file, "r") as additional_content,
313+
):
313314
file_content = (
314315
f"{additional_content.read()}\n{base.read()}"
315316
if prepend_additional_content

packages/gcp-sphinx-docfx-yaml/noxfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import nox
1818

1919
DEFAULT_PYTHON_VERSION = "3.14"
20-
UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
20+
UNIT_TEST_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"]
2121
RUFF_VERSION = "ruff==0.14.14"
2222

2323
ALL_PYTHON = list(UNIT_TEST_PYTHON_VERSIONS)
@@ -135,10 +135,10 @@ def lint_setup_py(session):
135135
@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
136136
def unit(session):
137137
"""Run unit tests."""
138-
# Re-enable 3.8, 3.9, 3.11, 3.12, and 3.13 after environment verification.
138+
# Re-enable 3.11, 3.12, and 3.13 after environment verification.
139139
# TODO(https://github.com/googleapis/google-cloud-python/issues/16176):
140140
# Track 3.14 compatibility as upstream dependencies stabilize.
141-
_skip_python_session(session, ["3.7", "3.8", "3.9", "3.11", "3.12", "3.13", "3.14"])
141+
_skip_python_session(session, ["3.11", "3.12", "3.13", "3.14"])
142142
session.install("-r", "requirements.txt")
143143
session.install("pytest")
144144
session.run("pytest", "tests")

0 commit comments

Comments
 (0)