From 8d46c6129b054e6429bed72ac9f29149424d9479 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 7 May 2026 13:07:37 +0000 Subject: [PATCH 1/2] chore: adjust string replacements for gapic-generator 1.32.0 --- .../add-dependency-google-cloud-common.yaml | 19 +- ...-dependencies-to-setup-py-constraints.yaml | 105 +--- .../allow-docs-warnings.yaml | 79 --- .../bigquery-storage-integration.yaml | 18 - .../bigtable-integration.yaml | 12 - ...containeranalysis-grafeas-integration.yaml | 19 +- .../datastore-integration.yaml | 4 +- .../doc-formatting.yaml | 576 ------------------ .../firestore-integration.yaml | 19 +- .../integrate-isolated-handwritten-code.yaml | 62 +- .../logging-integration.yaml | 27 +- ...y-error-with-org-policy-as-dependency.yaml | 46 -- .../pubsub-integration.yaml | 2 +- .../storage-integration.yaml | 29 +- 14 files changed, 62 insertions(+), 955 deletions(-) delete mode 100644 .librarian/generator-input/client-post-processing/allow-docs-warnings.yaml delete mode 100644 .librarian/generator-input/client-post-processing/doc-formatting.yaml delete mode 100644 .librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml diff --git a/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml b/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml index 2471e680d80b..22f22df1e651 100644 --- a/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml +++ b/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml @@ -19,28 +19,17 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-common >= 1.0.0, <2.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-filestore/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - google-cloud-common==1.0.0 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 diff --git a/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml b/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml index 628449f4b6df..4ac707826312 100644 --- a/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml +++ b/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -description: setup.py and testing/constraints-3.9.txt are missing necessary dependencies +description: setup.py is missing necessary dependencies url: https://github.com/googleapis/gapic-generator-python/issues/1831 replacements: - paths: [ @@ -19,167 +19,112 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpc-google-iam-v1 >=0.12.4, <1.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-gke-hub/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - grpc-google-iam-v1==0.12.4 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ packages/google-cloud-build/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpc-google-iam-v1 >=0.12.4, <1.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-build/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - grpc-google-iam-v1==0.12.4 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ packages/google-cloud-binary-authorization/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grafeas >= 1.7.0, <2.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-binary-authorization/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - grafeas==1.7.0 - google-auth==2.35.0 - count: 1 - - paths: [ - packages/google-cloud-iam/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - grpc-google-iam-v1==0.12.4 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ packages/google-cloud-iam/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpc-google-iam-v1 >=0.12.4, <1.0.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ packages/google-cloud-policysimulator/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-org-policy >= 1.11.1, <2.0.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ packages/google-shopping-merchant-notifications/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-shopping-type >= 1.0.0, <2.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-shopping-merchant-notifications/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - google-shopping-type==1.0.0 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 diff --git a/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml b/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml deleted file mode 100644 index ccd9eec45813..000000000000 --- a/.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2025 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -description: Allow documentation warnings for google-shopping-merchant-accounts due to formatting issue in google/protobuf/empty.proto -url: https://github.com/googleapis/gapic-generator-python/issues/2490 -# Note: having one replacement per package instead of just listing the paths -# is annoying, but that's what synthtool expects and it's not worth fixing that -# at this stage. -replacements: - - paths: [ - packages/google-ads-admanager/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-analytics-data/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-compute/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-compute-v1beta/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-container/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-dataplex/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-dialogflow-cx/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-network-connectivity/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-cloud-recaptcha-enterprise/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 - - paths: [ - packages/google-shopping-merchant-accounts/noxfile.py, - ] - before: ' "-W", # warnings as errors\n' - after: '' - count: 1 diff --git a/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml b/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml index 26ff40586b3b..0a495b68d521 100644 --- a/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml +++ b/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml @@ -450,24 +450,6 @@ replacements: "BigQueryWriteClient", ) count: 1 - - paths: [ - packages/google-cloud-bigquery-storage/testing/constraints-3.9.txt, - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - libcst==0.2.5 - fastavro==1.1.0 - # pytz is required by pandas - pytz - pandas==1.1.3 - # numpy is a dependency of pandas - numpy==1.19.3 - pyarrow==3.0.0 - google-auth==2.35.0 - count: 1 # Given that this file is mostly handwritten, we could omit the file during code generation # This will require a change to gapic-generator-python to provide the ability to omit files - paths: [ diff --git a/.librarian/generator-input/client-post-processing/bigtable-integration.yaml b/.librarian/generator-input/client-post-processing/bigtable-integration.yaml index 555a12bef8c6..9f0f7a3ccd5a 100644 --- a/.librarian/generator-input/client-post-processing/bigtable-integration.yaml +++ b/.librarian/generator-input/client-post-processing/bigtable-integration.yaml @@ -203,18 +203,6 @@ replacements: "google-crc32c>=1.5.0, <2.0.0dev", ] count: 1 - - paths: [ - packages/google-cloud-bigtable/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - google-cloud-core==2.0.0 - grpc-google-iam-v1==0.12.4 - google-auth==2.35.0 - count: 1 - paths: [ packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/async_client.py, packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/client.py, diff --git a/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml b/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml index 5a06d4b842b5..0c8a8e94be54 100644 --- a/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml +++ b/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml @@ -19,30 +19,19 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grafeas >=1.7.0, <2.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-containeranalysis/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - grafeas==1.7.0 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py, diff --git a/.librarian/generator-input/client-post-processing/datastore-integration.yaml b/.librarian/generator-input/client-post-processing/datastore-integration.yaml index 8de65a6010d6..15c954f6de18 100644 --- a/.librarian/generator-input/client-post-processing/datastore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/datastore-integration.yaml @@ -33,11 +33,11 @@ replacements: ] before: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - \ "grpcio >= 1.33.2, < 2.0.0", + \ "grpcio >= 1.44.0, < 2.0.0", after: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-core >= 2.0.0, <3.0.0", - "grpcio >= 1.38.0, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ "packages/google-cloud-datastore/mypy.ini", diff --git a/.librarian/generator-input/client-post-processing/doc-formatting.yaml b/.librarian/generator-input/client-post-processing/doc-formatting.yaml deleted file mode 100644 index 6c654c8f81cc..000000000000 --- a/.librarian/generator-input/client-post-processing/doc-formatting.yaml +++ /dev/null @@ -1,576 +0,0 @@ -# Copyright 2023 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -description: Fix formatting issues in docs -url: https://github.com/googleapis/gapic-generator-python/issues/1829 -replacements: - - paths: [ - packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py, - packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py - ] - before: | - \ role's permitted operations: - \ - \ - reader can use the resource \(e.g. - \ tuned model\) for inference - \ - writer has reader's permissions and - \ additionally can edit and share - \ - owner has writer's permissions and - \ additionally can delete - after: " role's permitted operations:\n\n - reader can use the resource (e.g.\n tuned model) for inference\n - writer has reader's permissions and\n additionally can edit and share\n - owner has writer's permissions and\n additionally can delete\n" - count: 6 - - paths: [ - packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py, - ] - before: | - \ previous role's permitted operations: - \ - \ - reader can use the resource \(e.g. tuned model\) for inference - \ - writer has reader's permissions and additionally can edit and - \ share - \ - owner has writer's permissions and additionally can delete - after: " previous role's permitted operations:\n\n - reader can use the resource (e.g. tuned model) for inference\n - writer has reader's permissions and additionally can edit and\n share\n - owner has writer's permissions and additionally can delete\n" - count: 1 - - paths: [ - packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/usage.py, - ] - before: | - \ references are not yet counted in usage computation - \ https://cloud.google.com/bigquery/docs/querying-wildcard-tables - after: " references are not yet counted in usage computation\n https://cloud.google.com/bigquery/docs/querying-wildcard-tables\n" - count: 1 - - paths: [ - packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py, - ] - before: | - \ 14 years, 51 weeks, 6 days, 23 hours, 59 - after: " 14 years, 51 weeks, 6 days, 23 hours, 59\n" - count: 1 - - paths: [ - packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/policy_based_routing.py, - ] - before: | - \ 1000. The priority value must be from 1 to - \ 65535, inclusive. - after: " 1000. The priority value must be from 1 to\n 65535, inclusive.\n" - count: 1 - - paths: [ - packages/google-cloud-visionai/google/cloud/visionai_v1/types/platform.py, - packages/google-cloud-visionai/google/cloud/visionai_v1alpha1/types/platform.py, - ] - before: | - \ 'ingestionTime': DOUBLE; \(UNIX timestamp\) - \ 'application': STRING; - after: " 'ingestionTime': DOUBLE; (UNIX timestamp)\n 'application': STRING;\n" - count: 2 - - paths: [ - packages/google-cloud-visionai/google/cloud/visionai_v1/types/platform.py, - packages/google-cloud-visionai/google/cloud/visionai_v1alpha1/types/platform.py, - ] - before: "'processor': STRING;\n }\n" - after: "'processor': STRING;\n\n }\n\n" - count: 2 - - paths: [ - packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py, - ] - before: | - \n Currently support query strings are: - \ ------------------------------------ - \ - \ ``SplitType=DATASET_SPLIT_TEST\|DATASET_SPLIT_TRAIN\|DATASET_SPLIT_UNASSIGNED`` - \ - \ - ``LabelingState=DOCUMENT_LABELED\|DOCUMENT_UNLABELED\|DOCUMENT_AUTO_LABELED`` - after: "\n Currently support query strings are:\n\n - ``SplitType=DATASET_SPLIT_TEST|DATASET_SPLIT_TRAIN|DATASET_SPLIT_UNASSIGNED``\n - ``LabelingState=DOCUMENT_LABELED|DOCUMENT_UNLABELED|DOCUMENT_AUTO_LABELED``\n" - count: 1 - - paths: [ - packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py, - ] - before: \|Message sent with app authentication\| - after: "|Message sent with app authentication async|" - count: 2 - - paths: [ - packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py, - ] - before: \|Message sent with app authentication\| - after: "|Message sent with app authentication async gRPC|" - count: 2 - - paths: [ - packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py, - ] - before: \|Message sent with app authentication\| - after: "|Message sent with app authentication gRPC|" - count: 2 - - paths: [ - packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py, - ] - before: \|Message sent with user authentication\| - after: "|Message sent with user authentication async|" - count: 2 - - paths: [ - packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py, - ] - before: \|Message sent with user authentication\| - after: "|Message sent with user authentication async gRPC|" - count: 2 - - paths: [ - packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py, - ] - before: \|Message sent with user authentication\| - after: "|Message sent with user authentication gRPC|" - count: 2 - - paths: [ - packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py, - packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py, - packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py, - ] - before: | - \ 1024. Any integer between 256 and 4500 is - \ considered valid. - after: " 1024. Any integer between 256 and 4500 is\n considered valid.\n" - count: 3 - - paths: [ - packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py, - ] - before: | - Optional. Column fractional seconds precision - \ - used only for timestamp based datatypes - if - \ not specified and relevant uses the source - after: | - Optional. Column fractional seconds precision: - - - used only for timestamp based datatypes - - if not specified and relevant uses the source - count: 1 - - paths: [ - packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py, - ] - before: | - If true, separate clusters by their - \ geographic region \(from geocoding\). Uses the - \ following entity features:\n - \ - schema.org/addressLocality - \ - schema.org/addressRegion - \ - schema.org/addressCountry - \ Warning: processing will no longer be - \ regionalized! - after: | - If true, separate clusters by their - geographic region (from geocoding). Uses the - following entity features:\n - - schema.org/addressLocality - - schema.org/addressRegion - - schema.org/addressCountry\n - Warning: processing will no longer be - regionalized! - count: 1 - - paths: [ - packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py, - ] - before: | - Optional. Any additional notes for this Site. - \ Please include information about:\n - \ - security or access restrictions - \ - any regulations affecting the technicians - \ visiting the site - \ - any special process or approval required to - \ move the equipment - \ - whether a representative will be available - \ during site visits - after: | - Optional. Any additional notes for this Site. - Please include information about:\n - - security or access restrictions - - any regulations affecting the technicians - visiting the site - - any special process or approval required to - move the equipment - - whether a representative will be available - during site visits\n - count: 1 - - paths: [ - packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py, - ] - before: | - Optional. The window of hours during the day - \ when maintenance should be performed. The window - \ is a 4 hour slot. Valid values are:\n - \ 0 - represents time slot 0:00 - 3:59 UTC - \ 4 - represents time slot 4:00 - 7:59 UTC - \ 8 - represents time slot 8:00 - 11:59 UTC - \ 12 - represents time slot 12:00 - 15:59 UTC - \ 16 - represents time slot 16:00 - 19:59 UTC 20 - \ - represents time slot 20:00 - 23:59 UTC - after: | - Optional. The window of hours during the day - when maintenance should be performed. The window - is a 4 hour slot. Valid values are:\n - 0 - represents time slot 0:00 - 3:59 UTC - 4 - represents time slot 4:00 - 7:59 UTC - 8 - represents time slot 8:00 - 11:59 UTC - 12 - represents time slot 12:00 - 15:59 UTC - 16 - represents time slot 16:00 - 19:59 UTC - 20 - represents time slot 20:00 - 23:59 UTC - count: 1 - - paths: [ - packages/google-cloud-service-control/google/cloud/servicecontrol_v1/types/service_controller.py, - ] - before: | - The Google cloud project number, e.g. - \ 1234567890. A value of 0 indicates no project - \ number is found. - after: | - The Google cloud project number, e.g. - 1234567890. A value of 0 indicates no project - number is found. - count: 1 - - paths: [ - packages/google-maps-routing/google/maps/routing_v2/types/toll_passes.py, - ] - before: | - E-card provided by multiple banks used to pay - \ for tolls. All e-cards via banks are charged the - \ same so only one enum value is needed. E.g. - \ - Bank Mandiri - after: | - E-card provided by multiple banks used to pay - for tolls. All e-cards via banks are charged the - same so only one enum value is needed. E.g.\n - - Bank Mandiri - count: 1 - - paths: [ - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/online_return_policy_service/async_client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/online_return_policy_service/client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/online_return_policy_service/transports/grpc.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/online_return_policy_service/transports/grpc_asyncio.py, - ] - before: "This API defines the following resource model:\n --------------------------------------------------------\n\n `OnlineReturnPolicy" - after: "This API defines the following resource model:\n\n - `OnlineReturnPolicy" - count: 4 - - paths: [ - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/online_return_policy_service/async_client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/online_return_policy_service/client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/online_return_policy_service/transports/grpc.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/online_return_policy_service/transports/grpc_asyncio.py, - ] - before: "This API defines the following resource model:\n --------------------------------------------------------\n\n \\[OnlineReturnPolicy" - after: "This API defines the following resource model:\n\n - [OnlineReturnPolicy" - count: 4 - - paths: [ - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/omnichannel_settings_service/async_client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/omnichannel_settings_service/client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/omnichannel_settings_service/transports/grpc.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/omnichannel_settings_service/transports/grpc_asyncio.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/omnichannel_settings_service/async_client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/omnichannel_settings_service/client.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/omnichannel_settings_service/transports/grpc.py, - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1/services/omnichannel_settings_service/transports/grpc_asyncio.py, - ] - before: | - This API defines the following resource model: - \ ----------------------------------------------\n - \ \[OmnichannelSetting\]\[google.shopping.merchant.accounts.v1.OmnichannelSetting\] - after: | - This API defines the following resource model: - - [OmnichannelSetting][google.shopping.merchant.accounts.v1.OmnichannelSetting] - count: 8 - - paths: [ - packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/types/shippingsettings.py - ] - before: | - Required. This field is used for avoid async - \ issue. Make sure shipping setting data - \ didn't change between get call and insert call. - after: | - Required. This field is used for avoid async - issue. Make sure shipping setting data - didn't change between get call and insert call. - count: 1 - - paths: [ - packages/google-shopping-merchant-reports/google/shopping/merchant_reports_v1alpha/types/reports.py, - packages/google-shopping-merchant-reports/google/shopping/merchant_reports_v1beta/types/reports.py, - packages/google-shopping-merchant-reports/google/shopping/merchant_reports_v1/types/reports.py, - ] - before: | - Here's an example of how the aggregated status is computed:\n - \ Free listings \\\| Shopping ads \\\| Status - \ --------------\\\|--------------\\\|------------------------------ - \ Approved \\\| Approved \\\| ELIGIBLE Approved \\\| Pending \\\| ELIGIBLE - \ Approved \\\| Disapproved \\\| ELIGIBLE_LIMITED Pending \\\| Pending \\\| - \ PENDING Disapproved \\\| Disapproved \\\| NOT_ELIGIBLE_OR_DISAPPROVED\n - \ Values: - after: | - Here's an example of how the aggregated status is computed:\n - ``` - Free listings \| Shopping ads \| Status - --------------\|--------------\|------------------------------ - Approved \| Approved \| ELIGIBLE Approved \| Pending \| ELIGIBLE - Approved \| Disapproved \| ELIGIBLE_LIMITED Pending \| Pending \| - PENDING Disapproved \| Disapproved \| NOT_ELIGIBLE_OR_DISAPPROVED - ```\n - Values: - count: 3 - - paths: [ - packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric_service.py - ] - before: | - Optional. If true, only metrics and monitored - \ resource types that have recent data \(within - \ roughly 25 hours\) will be included in the - \ response. - \ - If a metric descriptor enumerates monitored - \ resource types, only the monitored resource - \ types for which the metric type has recent - \ data will be included in the returned - \ metric descriptor, and if none of them have - \ recent data, the metric descriptor will not be - \ returned. - \ - If a metric descriptor does not enumerate the - \ compatible monitored resource types, it - \ will be returned only if the metric type has - \ recent data for some monitored resource - \ type. The returned descriptor will not - \ enumerate any monitored resource types. - after: | - Optional. If true, only metrics and monitored - resource types that have recent data (within - roughly 25 hours) will be included in the - response.\n - - If a metric descriptor enumerates monitored - resource types, only the monitored resource - types for which the metric type has recent - data will be included in the returned - metric descriptor, and if none of them have - recent data, the metric descriptor will not be - returned. - - If a metric descriptor does not enumerate the - compatible monitored resource types, it - will be returned only if the metric type has - recent data for some monitored resource - type. The returned descriptor will not - enumerate any monitored resource types. - count: 1 - - paths: [ - packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/environments.py, - packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py, - ] - before: | - \{ - "example": "ZXhhbXBsZV92YWx1ZQ==", - "another-example": - "YW5vdGhlcl9leGFtcGxlX3ZhbHVl" \} - after: | - .. code-block:: json\n - { - "example": "ZXhhbXBsZV92YWx1ZQ==", - "another-example": "YW5vdGhlcl9leGFtcGxlX3ZhbHVl" - }\n - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: "Classification\n ''''''''''''''" - after: "Classification:" - count: 6 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: | - AutoML Vision - \ \^\^\^\^\^\^\^\^\^\^\^\^\^ - after: | - AutoML Vision: - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: | - AutoML Tables - \ \^\^\^\^\^\^\^\^\^\^\^\^\^ - after: | - AutoML Tables: - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: | - AutoML Tables - \ \^\^\^\^\^\^\^\^\^\^\^\^\^ - after: | - AutoML Tables: - count: 1 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: "Entity Extraction\n '''''''''''''''''" - after: "Entity Extraction:" - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: "Sentiment Analysis\n ''''''''''''''''''" - after: "Sentiment Analysis:" - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: "Object Tracking\n '''''''''''''''" - after: "Object Tracking:" - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: | - AutoML Video Intelligence - \ \^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^ - after: | - AutoML Video Intelligence: - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: "Object Detection\n ''''''''''''''''" - after: "Object Detection:" - count: 2 - - paths: [ - packages/google-cloud-automl/google/cloud/automl_v1/types/io.py, - ] - before: | - AutoML Natural Language - \ \^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^ - after: | - AutoML Natural Language: - count: 2 - - paths: [ - packages/google-cloud-workflows/google/cloud/workflows_v1/types/workflows.py, - ] - before: | - The maximum number of revisions to return per - \ page. If a value is not specified, a default - \ value of 20 is used. The maximum permitted value - \ is - \ 100. Values greater than 100 are coerced down to - \ 100. - after: | - The maximum number of revisions to return per - page. If a value is not specified, a default - value of 20 is used. The maximum permitted value - is 100. Values greater than 100 are coerced down - to 100. - count: 1 - - paths: [ - packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_lb_policy.py, - ] - before: | - Optional. If set to 'True', an unhealthy - \ IG/NEG will be set as drained. - \ - An IG/NEG is considered unhealthy if less than - after: | - Optional. If set to 'True', an unhealthy - IG/NEG will be set as drained.\n - - An IG/NEG is considered unhealthy if less than - count: 1 - - paths: [ - packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py, - packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py, - packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py, - ] - before: | - Example #1 \(multi-turn /search API calls\): - \ - \ Call /search API with the session ID generated - \ in the first call. Here, the previous search - \ query gets considered in query standing. I.e., - \ if the first query is "How did Alphabet do in - \ 2022\?" and the current query is "How about - \ 2023\?", the current query will be interpreted - \ as "How did Alphabet do in 2023\?". - \ - \ Example #2 \(coordination between /search API - \ calls and /answer API calls\): - \ - \ Call /answer API with the session ID generated - \ in the first call. Here, the answer generation - \ happens in the context of the search results - \ from the first search call. - after: | - Example #1 (multi-turn /search API calls):\n - - Call /search API with the session ID generated - in the first call. Here, the previous search - query gets considered in query standing. I.e., - if the first query is "How did Alphabet do in - 2022?" and the current query is "How about - 2023?", the current query will be interpreted - as "How did Alphabet do in 2023?".\n - Example #2 (coordination between /search API - calls and /answer API calls):\n - - Call /answer API with the session ID generated - in the first call. Here, the answer generation - happens in the context of the search results - from the first search call. - count: 3 - - paths: [ - packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/types/maintenance_service.py, - ] - before: | - user_controllable \(bool\): - \ Output only. Indicates whether the user has - \ some control over that maintenance, either - \ proactively before maintenance was scheduled - after: | - user_controllable (bool): - Output only. Indicates whether the user has - some control over that maintenance, either - proactively before maintenance was scheduled - count: 1 - - paths: [ - packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/business_glossary.py, - ] - before: | - Examples of using a filter are: - \ -------------------------------\n - \ ``immediate_parent="projects/\{project_id_or_number\}/locations/\{location_id\}/glossaries/\{glossary_id\}"`` - \ -------------------------------------------------------------------------------------------------------\n - \ ``immediate_parent="projects/\{project_id_or_number\}/locations/\{location_id\}/glossaries/\{glossary_id\}/categories/\{category_id\}"`` - after: | - Examples of using a filter are:\n - - ``immediate_parent="projects/{project_id_or_number}/locations/{location_id}/glossaries/{glossary_id}"`` - - ``immediate_parent="projects/{project_id_or_number}/locations/{location_id}/glossaries/{glossary_id}/categories/{category_id}"`` - count: 2 - - paths: [ - packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py, - ] - before: | - The format[\s]+is:\n - \ [\s]+projects/\{project\}/locations/\{location\} or - \ organizations/\{organization\}/locations/\{location\} - \ or[\s]+folders/\{folder\}/locations/\{location\} - after: | - The format is:\n - projects/{project}/locations/{location} or - organizations/{organization}/locations/{location} - or folders/{folder}/locations/{location} - count: 4 - - paths: [ - packages/google-maps-routeoptimization/google/maps/routeoptimization_v1/types/route_optimization_service.py, - ] - before: | - The ratio \(vehicle_end_time - vehicle_start_time\) / \(latest_vehicle_end_time - earliest_vehicle_start_time\) for a given vehicle. If the denominator is not present, it uses \(\[ShipmentModel.global_end_time\]\[google.maps.routeoptimization.v1.ShipmentModel.global_end_time\] - \ ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n - \ \[ShipmentModel.global_start_time\]\[google.maps.routeoptimization.v1.ShipmentModel.global_start_time\]\) - \ instead. - after: | - The ratio (vehicle_end_time - vehicle_start_time) / (latest_vehicle_end_time - earliest_vehicle_start_time) for a given vehicle. If the denominator is not present, it uses - ([ShipmentModel.global_end_time][google.maps.routeoptimization.v1.ShipmentModel.global_end_time] - - [ShipmentModel.global_start_time][google.maps.routeoptimization.v1.ShipmentModel.global_start_time]) - instead. - count: 1 diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml index c57d748c8378..f46638e81393 100644 --- a/.librarian/generator-input/client-post-processing/firestore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/firestore-integration.yaml @@ -15,17 +15,6 @@ description: Integrate Google Cloud Firestore Handwritten code # TODO(Fill in issue number below to add more context) url: https://github.com/googleapis/gapic-generator-python/issues/123 replacements: - - paths: [ - "packages/google-cloud-firestore/testing/constraints-3.9.txt", - ] - before: | - proto-plus==1.22.3 - protobuf==4.25.8 - after: | - proto-plus==1.22.3 - google-cloud-core==2.0.0 - protobuf==4.25.8 - count: 1 - paths: [ "packages/google-cloud-firestore/google/cloud/firestore_bundle/types/bundle.py", ] @@ -484,10 +473,10 @@ replacements: "packages/google-cloud-firestore/google/cloud/firestore_bundle/__init__.py", ] before: | - metadata\n\n + metadata\n from .types.bundle import \( after: | - metadata\n\n + metadata\n from .bundle import FirestoreBundle from .types.bundle import ( count: 1 @@ -614,11 +603,11 @@ replacements: ] before: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - \ "grpcio >= 1.33.2, < 2.0.0", + \ "grpcio >= 1.44.0, < 2.0.0", after: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-core >= 2.0.0, <3.0.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ "packages/google-cloud-firestore/docs/index.rst", diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index 28b86130dd25..8141056571a6 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -60,30 +60,19 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", + "google-api-core\[grpc\] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", + "google-api-core[grpc] >= 2.17.1, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-core >= 2.0.0, <3.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - "packages/google-cloud-translate/testing/constraints-3.9.txt" - ] - before: | - proto-plus==1.22.3 - protobuf==4.25.8 - after: | - proto-plus==1.22.3 - google-cloud-core==2.0.0 - protobuf==4.25.8 + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ "packages/google-cloud-translate/docs/index.rst", @@ -174,19 +163,6 @@ replacements: after: | extras = {"pandas": "pandas >= 1.1.3"} count: 1 - - paths: [ - packages/google-cloud-monitoring/testing/constraints-3.9.txt, - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - pandas==1.1.3 - # numpy is a dependency of pandas - numpy==1.19.3 - google-auth==2.35.0 - count: 1 - paths: [ packages/google-cloud-monitoring/noxfile.py, ] @@ -227,21 +203,6 @@ replacements: "storage": ["google-cloud-storage >=2.14.0, <4.0.0"], } count: 1 - - paths: [ - packages/google-cloud-automl/testing/constraints-3.9.txt, - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - google-cloud-storage==2.14.0 - libcst==0.2.5 - pandas==1.1.3 - # numpy is a dependency of pandas - numpy==1.19.3 - google-auth==2.35.0 - count: 1 - paths: [ packages/google-cloud-automl/docs/automl_v1beta1/services_.rst, ] @@ -349,22 +310,11 @@ replacements: ] before: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", after: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-logging>=3.9.0, <4.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-error-reporting/testing/constraints-3.9.txt, - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - google-cloud-logging==3.9.0 - google-auth==2.35.0 + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ "packages/google-cloud-error-reporting/docs/index.rst", diff --git a/.librarian/generator-input/client-post-processing/logging-integration.yaml b/.librarian/generator-input/client-post-processing/logging-integration.yaml index dc7955067b7e..567b536f47be 100644 --- a/.librarian/generator-input/client-post-processing/logging-integration.yaml +++ b/.librarian/generator-input/client-post-processing/logging-integration.yaml @@ -38,7 +38,7 @@ replacements: ] before: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - \ "grpcio >= 1.33.2, < 2.0.0", + \ "grpcio >= 1.44.0, < 2.0.0", after: | "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "google-cloud-appengine-logging>=0.1.3, <2.0.0", @@ -46,7 +46,7 @@ replacements: "google-cloud-core >= 2.0.0, <3.0.0", "grpc-google-iam-v1 >=0.12.4, <1.0.0", "opentelemetry-api >= 1.9.0", - "grpcio >= 1.33.2, < 2.0.0", + "grpcio >= 1.44.0, < 2.0.0", count: 1 - paths: [ "packages/google-cloud-logging/samples/generated_samples/logging_v2_generated_config_service_v2_copy_log_entries_async.py", @@ -285,29 +285,6 @@ replacements: before: 'logging_v2.Tail' after: 'logging_v2.types.Tail' count: 2 - - paths: [ - "packages/google-cloud-logging/testing/constraints-3.9.txt", - ] - before: | - proto-plus==1.22.3 - protobuf==4.25.8 - after: | - proto-plus==1.22.3 - google-cloud-core==2.0.0 - google-cloud-appengine-logging==0.1.3 - google-cloud-audit-log==0.3.1 - grpc-google-iam-v1==0.12.4 - opentelemetry-api==1.16.0\n - # Lower bound testing for optional dependencies - django==3.2\n - # Need specific versions of Flask dependencies for Flask 1.0 to work - flask==1.0.0 - jinja2==2.10.1 - markupsafe==2.0.1 - itsdangerous==2.0.1 - werkzeug==1.0.1 - protobuf==4.25.8 - count: 1 - paths: [ "packages/google-cloud-logging/docs/conf.py", ] diff --git a/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml b/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml deleted file mode 100644 index 615fecdbecf3..000000000000 --- a/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2023 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -description: Mypy error in asset golden files when adding dependency for google-cloud-org-policy -url: https://github.com/googleapis/gapic-generator-python/issues/1806 -replacements: - - paths: [ - packages/google-cloud-asset/setup.py - ] - before: | - dependencies = \[ - "google-api-core\[grpc\] >= 2.11.0, <3.0.0", - # Exclude incompatible versions of `google-auth` - # See https://github.com/googleapis/google-cloud-python/issues/12364 - "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "grpcio >= 1.33.2, < 2.0.0", - after: | - dependencies = [ - "google-api-core[grpc] >= 2.11.0, <3.0.0", - # Exclude incompatible versions of `google-auth` - # See https://github.com/googleapis/google-cloud-python/issues/12364 - "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", - "google-cloud-org-policy >= 1.11.1, <2.0.0", - "grpcio >= 1.33.2, < 2.0.0", - count: 1 - - paths: [ - packages/google-cloud-asset/testing/constraints-3.9.txt - ] - before: | - google-api-core==2.21.0 - google-auth==2.35.0 - after: | - google-api-core==2.21.0 - google-cloud-org-policy==1.11.1 - google-auth==2.35.0 - count: 1 diff --git a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml index 2c29d96f3b8a..f71a623a4b8e 100644 --- a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml +++ b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml @@ -382,7 +382,7 @@ replacements: - "packages/google-cloud-pubsub/setup.py" before: '([ \t]+)("grpc-google-iam-v1.*",\n)\]\nextras = \{\}' after: |- - \g<1>\g<2>\g<1>"grpcio-status >= 1.33.2", + \g<1>\g<2>\g<1>"grpcio-status >= 1.44.0", \g<1>"opentelemetry-api >= 1.27.0", \g<1>"opentelemetry-sdk >= 1.27.0", ] diff --git a/.librarian/generator-input/client-post-processing/storage-integration.yaml b/.librarian/generator-input/client-post-processing/storage-integration.yaml index 8f82459dd3b0..7d3f06551e6d 100644 --- a/.librarian/generator-input/client-post-processing/storage-integration.yaml +++ b/.librarian/generator-input/client-post-processing/storage-integration.yaml @@ -597,7 +597,7 @@ replacements: # experimental in this SDK. More info in b/465352227 "grpc": [ "google-api-core[grpc] >= 2.27.0, < 3.0.0", - "grpcio >= 1.33.2, < 2.0.0; python_version < '3.14'", + "grpcio >= 1.44.0, < 2.0.0; python_version < '3.14'", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "grpcio-status >= 1.76.0, < 2.0.0", "proto-plus >= 1.22.3, <2.0.0; python_version < '3.13'", @@ -636,26 +636,25 @@ replacements: } count: 1 - paths: [ - packages/google-cloud-storage/testing/constraints-3.9.txt + packages/google-cloud-storage/testing/constraints-3.10.txt, ] before: | - google-api-core==2.21.0 - [\s\S]*?grpc-google-iam-v1==0.14.0 + google-api-core[\s\S]* + [\s\S]*?grpc-google-iam-v1[\s\S]* after: | - google-auth==2.26.1 + google-auth # cryptography is a direct dependency of google-auth cryptography - google-api-core==2.27.0 - google-cloud-core==2.4.2 - google-resumable-media==2.7.2 - grpcio==1.33.2 - requests==2.22.0 - google-crc32c==1.6.0 - protobuf==4.25.8 - opentelemetry-api==1.1.0 + google-api-core + google-cloud-core + google-resumable-media + grpcio + requests + google-crc32c + protobuf + opentelemetry-api count: 1 - paths: [ - packages/google-cloud-storage/testing/constraints-3.10.txt, packages/google-cloud-storage/testing/constraints-3.11.txt, packages/google-cloud-storage/testing/constraints-3.12.txt, ] @@ -674,7 +673,7 @@ replacements: google-crc32c protobuf opentelemetry-api - count: 3 + count: 2 - paths: [ packages/google-cloud-storage/testing/constraints-3.13.txt, packages/google-cloud-storage/testing/constraints-3.14.txt, From f36d76583d46a467d3a9ac10e97f889684b5c97e Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Wed, 13 May 2026 07:23:47 +0000 Subject: [PATCH 2/2] chore: update librarian version to v0.13.0 This includes gapic-generator 1.32.0. --- librarian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librarian.yaml b/librarian.yaml index 584da47ef22f..5d9c8aee9040 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. language: python -version: v0.12.0 +version: v0.13.0 repo: googleapis/google-cloud-python sources: googleapis: