Skip to content

Commit fd17594

Browse files
hebaalazzehhebaalazzeh
committed
Merge origin/main into feat/gapic-generator-centralization-request-id
2 parents f454c14 + 270c7fe commit fd17594

198 files changed

Lines changed: 29306 additions & 360 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/add-dependency-google-cloud-common.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ replacements:
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
2626
"grpcio >= 1.59.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
29+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ replacements:
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
2626
"grpcio >= 1.59.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
29+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",
@@ -38,14 +38,14 @@ replacements:
3838
]
3939
before: |
4040
dependencies = \[
41-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
41+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
4242
# Exclude incompatible versions of `google-auth`
4343
# See https://github.com/googleapis/google-cloud-python/issues/12364
4444
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
4545
"grpcio >= 1.59.0, < 2.0.0",
4646
after: |
4747
dependencies = [
48-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
48+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",
@@ -57,14 +57,14 @@ replacements:
5757
]
5858
before: |
5959
dependencies = \[
60-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
60+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
6161
# Exclude incompatible versions of `google-auth`
6262
# See https://github.com/googleapis/google-cloud-python/issues/12364
6363
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
6464
"grpcio >= 1.59.0, < 2.0.0",
6565
after: |
6666
dependencies = [
67-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
67+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",
@@ -76,14 +76,14 @@ replacements:
7676
]
7777
before: |
7878
dependencies = \[
79-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
79+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
8080
# Exclude incompatible versions of `google-auth`
8181
# See https://github.com/googleapis/google-cloud-python/issues/12364
8282
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
8383
"grpcio >= 1.59.0, < 2.0.0",
8484
after: |
8585
dependencies = [
86-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
86+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",
@@ -95,14 +95,14 @@ replacements:
9595
]
9696
before: |
9797
dependencies = \[
98-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
98+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
9999
# Exclude incompatible versions of `google-auth`
100100
# See https://github.com/googleapis/google-cloud-python/issues/12364
101101
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
102102
"grpcio >= 1.59.0, < 2.0.0",
103103
after: |
104104
dependencies = [
105-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
105+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
106106
# Exclude incompatible versions of `google-auth`
107107
# See https://github.com/googleapis/google-cloud-python/issues/12364
108108
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
@@ -114,14 +114,14 @@ replacements:
114114
]
115115
before: |
116116
dependencies = \[
117-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
117+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
118118
# Exclude incompatible versions of `google-auth`
119119
# See https://github.com/googleapis/google-cloud-python/issues/12364
120120
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
121121
"grpcio >= 1.59.0, < 2.0.0",
122122
after: |
123123
dependencies = [
124-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
124+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
125125
# Exclude incompatible versions of `google-auth`
126126
# See https://github.com/googleapis/google-cloud-python/issues/12364
127127
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",

‎.librarian/generator-input/client-post-processing/asset-integration.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ replacements:
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
2626
"grpcio >= 1.59.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
29+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",

‎.librarian/generator-input/client-post-processing/bigtable-integration.yaml‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ replacements:
385385
"3.12",
386386
"3.13",
387387
"3.14",
388+
"3.15",
388389
]
389390
390391
UNIT_TEST_STANDARD_DEPENDENCIES = [
@@ -418,6 +419,16 @@ replacements:
418419
SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
419420
420421
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
422+
# Path to the centralized mypy configuration file at the repository root.
423+
# Search upwards to support running nox from both monorepo packages and integration test goldens.
424+
MYPY_CONFIG_FILE = next(
425+
(
426+
str(p / "mypy.ini")
427+
for p in CURRENT_DIRECTORY.parents
428+
if (p / "mypy.ini").exists()
429+
),
430+
str(CURRENT_DIRECTORY.parent.parent / "mypy.ini"),
431+
)
421432
422433
# 'docfx' is excluded since it only needs to run in 'docs-presubmit'
423434
nox.options.sessions = [
@@ -527,7 +538,12 @@ replacements:
527538
"types-requests",
528539
)
529540
session.install("google-cloud-testutils")
530-
session.run("mypy", "-p", "google.cloud.bigtable.data")
541+
session.run(
542+
"mypy",
543+
f"--config-file={MYPY_CONFIG_FILE}",
544+
"-p",
545+
"google.cloud.bigtable.data",
546+
)
531547
532548
533549
@nox.session(python=DEFAULT_PYTHON_VERSION)
@@ -568,25 +584,21 @@ replacements:
568584
@nox.session(python=ALL_PYTHON)
569585
@nox.parametrize(
570586
"protobuf_implementation",
571-
["python", "upb", "cpp"],
587+
["python", "upb"],
572588
)
573589
def unit(session, protobuf_implementation):
574590
# Install all test dependencies, then install this package in-place.
575-
py_version = tuple([int(v) for v in session.python.split(".")])
576-
if protobuf_implementation == "cpp" and py_version >= (3, 11):
577-
session.skip("cpp implementation is not supported in python 3.11+")
591+
592+
# TODO(https://github.com/googleapis/google-cloud-python/issues/17741):
593+
# Remove once `google-crc32c` wheels are published for 3.15
594+
if session.python == "3.15":
595+
session.skip("Skipping 3.15 until wheels are available for google-crc32c.")
578596
579597
constraints_path = str(
580598
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
581599
)
582600
install_unittest_dependencies(session, "-c", constraints_path)
583601
584-
# TODO(https://github.com/googleapis/synthtool/issues/1976):
585-
# Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
586-
# The 'cpp' implementation requires Protobuf<4.
587-
if protobuf_implementation == "cpp":
588-
session.install("protobuf<4")
589-
590602
# Run py.test against the unit tests.
591603
session.run(
592604
"py.test",
@@ -818,15 +830,11 @@ replacements:
818830
@nox.session(python=DEFAULT_PYTHON_VERSION)
819831
@nox.parametrize(
820832
"protobuf_implementation",
821-
["python", "upb", "cpp"],
833+
["python", "upb"],
822834
)
823835
def prerelease_deps(session, protobuf_implementation):
824836
"""Run all tests with prerelease versions of dependencies installed."""
825837
826-
py_version = tuple([int(v) for v in session.python.split(".")])
827-
if protobuf_implementation == "cpp" and py_version >= (3, 11):
828-
session.skip("cpp implementation is not supported in python 3.11+")
829-
830838
# Install all dependencies
831839
session.install("-e", ".[all, tests, tracing]")
832840
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ replacements:
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
2626
"grpcio >= 1.59.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
29+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
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",

‎.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ replacements:
6060
]
6161
before: |
6262
dependencies = \[
63-
"google-api-core\[grpc\] >= 2.24.2, <3.0.0",
63+
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
6464
# Exclude incompatible versions of `google-auth`
6565
# See https://github.com/googleapis/google-cloud-python/issues/12364
6666
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
6767
"grpcio >= 1.59.0, < 2.0.0",
6868
after: |
6969
dependencies = [
70-
"google-api-core[grpc] >= 2.24.2, <3.0.0",
70+
"google-api-core[grpc] >= 2.25.0, <3.0.0",
7171
# Exclude incompatible versions of `google-auth`
7272
# See https://github.com/googleapis/google-cloud-python/issues/12364
7373
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",

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

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,14 @@ replacements:
328328
-------------------
329329
.. toctree::
330330
:maxdepth: 2
331-
331+
332332
usage
333-
333+
334334
Documentation
335335
-------------------
336336
.. toctree::
337337
:maxdepth: 3
338-
338+
339339
client
340340
logger
341341
entries
@@ -344,20 +344,20 @@ replacements:
344344
sink
345345
handlers
346346
transport
347-
348-
347+
348+
349349
Migration Guides
350350
----------------
351-
351+
352352
See the guide below for instructions on migrating between major releases of this library.
353-
353+
354354
.. toctree::
355355
:maxdepth: 2
356-
356+
357357
UPGRADING
358358
count: 1
359359
- paths: [
360-
"packages/google-cloud-logging/google/cloud/logging/__init__.py",
360+
"packages/google-cloud-logging/google/cloud/logging/__init__.py",
361361
]
362362
before: |
363363
from google.cloud.logging import gapic_version as package_version
@@ -463,6 +463,24 @@ replacements:
463463
"django",
464464
]
465465
count: 1
466+
- paths: [
467+
packages/google-cloud-logging/noxfile.py
468+
]
469+
before: |
470+
CURRENT_DIRECTORY = pathlib.Path\(__file__\).parent.absolute\(\)
471+
after: |
472+
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
473+
# Path to the centralized mypy configuration file at the repository root.
474+
# Search upwards to support running nox from both monorepo packages and integration test goldens.
475+
MYPY_CONFIG_FILE = next(
476+
(
477+
str(p / "mypy.ini")
478+
for p in CURRENT_DIRECTORY.parents
479+
if (p / "mypy.ini").exists()
480+
),
481+
str(CURRENT_DIRECTORY.parent.parent / "mypy.ini"),
482+
)
483+
count: 1
466484
- paths: [
467485
packages/google-cloud-logging/noxfile.py
468486
]
@@ -478,4 +496,19 @@ replacements:
478496
# TODO(https://github.com/googleapis/google-cloud-python/issues/13362):
479497
# Enable mypy once this repo has been updated for mypy evaluation.
480498
session.skip("Skip mypy since this library is not yet updated for mypy evaluation")
499+
500+
session.install("-e", ".")
501+
session.install(
502+
"mypy",
503+
"types-setuptools",
504+
"types-protobuf",
505+
"types-requests",
506+
)
507+
session.run(
508+
"mypy",
509+
f"--config-file={MYPY_CONFIG_FILE}",
510+
"-p",
511+
"google",
512+
*session.posargs,
513+
)
481514
count: 1

0 commit comments

Comments
 (0)