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 8b4a4fcdaf25..c6992913b73f 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 @@ -23,7 +23,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -31,7 +31,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-filestore/testing/constraints-3.7.txt @@ -39,10 +39,8 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 google-cloud-common==1.0.0 - proto-plus==1.22.3 + google-auth==2.14.1 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 6ee29d86f11e..f3262d7936c2 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 @@ -23,7 +23,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -31,7 +31,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-gke-hub/testing/constraints-3.7.txt @@ -39,12 +39,10 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 grpc-google-iam-v1==0.12.4 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-build/setup.py @@ -55,7 +53,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -63,7 +61,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-build/testing/constraints-3.7.txt @@ -71,12 +69,10 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 grpc-google-iam-v1==0.12.4 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-binary-authorization/setup.py @@ -87,7 +83,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -95,7 +91,7 @@ replacements: # 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.1.2, <2.0", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-binary-authorization/testing/constraints-3.7.txt @@ -103,12 +99,10 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 grafeas==1.1.2 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-iam/testing/constraints-3.7.txt @@ -116,12 +110,10 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 grpc-google-iam-v1==0.12.4 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-iam/setup.py @@ -132,7 +124,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -140,7 +132,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-policysimulator/setup.py @@ -151,7 +143,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -159,7 +151,7 @@ replacements: # 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.0.0, <2.0.0", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-shopping-merchant-notifications/setup.py @@ -170,21 +162,15 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", - \] + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", # 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", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", "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.7.txt @@ -192,12 +178,8 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 - protobuf==3.20.2 after: | google-api-core==1.34.1 - google-auth==2.14.1 - proto-plus==1.22.3 google-shopping-type==1.0.0 - protobuf==3.20.2 + google-auth==2.14.1 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 9ae7cf942bc0..7dec38fc15f6 100644 --- a/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml +++ b/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml @@ -439,17 +439,13 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 - protobuf==3.20.2 after: | google-api-core==1.34.1 - google-auth==2.14.1 - proto-plus==1.22.3 libcst==0.2.5 fastavro==0.21.2 pandas==1.0.5 pyarrow==0.15.0 - protobuf==3.20.2 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-bigquery-storage/docs/index.rst, 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 92470bc21e3d..48b10313e71c 100644 --- a/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml +++ b/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml @@ -23,7 +23,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -31,7 +31,7 @@ replacements: # 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.4.1, <2.0", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-containeranalysis/testing/constraints-3.7.txt @@ -39,12 +39,10 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 grafeas==1.4.1 - proto-plus==1.22.3 + google-auth==2.14.1 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/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index a62f4ee794b5..818f6248e01e 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 @@ -64,7 +64,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -72,7 +72,7 @@ replacements: # 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 >= 1.4.4, <3.0.0", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ "packages/google-cloud-translate/testing/constraints-3.7.txt" @@ -179,12 +179,10 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 pandas==0.23.2 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-monitoring/noxfile.py, @@ -232,14 +230,12 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 google-cloud-storage==1.18.0 libcst==0.2.5 pandas==1.0.5 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1 - paths: [ packages/google-cloud-automl/docs/automl_v1beta1/services_.rst, 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 index 72b07040efc2..2c244b441296 100644 --- 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 @@ -23,7 +23,7 @@ replacements: # 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", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", @@ -31,7 +31,7 @@ replacements: # 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 >= 0.1.2, <2.0.0", - "proto-plus >= 1.22.3, <2.0.0", + "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ packages/google-cloud-asset/testing/constraints-3.7.txt @@ -39,10 +39,8 @@ replacements: before: | google-api-core==1.34.1 google-auth==2.14.1 - proto-plus==1.22.3 after: | google-api-core==1.34.1 - google-auth==2.14.1 google-cloud-org-policy==0.1.2 - proto-plus==1.22.3 + google-auth==2.14.1 count: 1