Skip to content

chore: update gapic-generator to v1.38 #18024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hebaalazzeh wants to merge 1 commit into from
Closed

chore: update gapic-generator to v1.38 #18024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand Down
24 changes: 12 additions & 12 deletions ...erator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand All @@ -38,14 +38,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand All @@ -57,14 +57,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand All @@ -76,14 +76,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand All @@ -95,14 +95,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand All @@ -114,14 +114,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand Down
8 changes: 4 additions & 4 deletions .librarian/generator-input/client-post-processing/asset-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand All @@ -38,10 +38,10 @@ replacements:
packages/google-cloud-asset/testing/constraints-3.10.txt
]
before: |
google-api-core==2.25.0
google-api-core==2.28.0
google-auth==2.14.1
after: |
google-api-core==2.25.0
google-api-core==2.28.0
google-cloud-org-policy==1.13.1
google-auth==2.14.1
count: 1
4 changes: 2 additions & 2 deletions .librarian/generator-input/client-post-processing/bigtable-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ replacements:
packages/google-cloud-bigtable/testing/constraints-3.10.txt,
]
before: |
google-api-core==2.25.0
google-api-core==2.28.0
google-auth==2.14.1
after: |
google-api-core==2.25.0
google-api-core==2.28.0
google-cloud-core==2.0.0
grpc-google-iam-v1==0.14.2
google-crc32c==1.6.0
Expand Down
4 changes: 2 additions & 2 deletions .librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand Down
2 changes: 0 additions & 2 deletions .librarian/generator-input/client-post-processing/firestore-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ replacements:
"packages/google-cloud-firestore/google/cloud/firestore_v1/__init__.py",
]
before: |
import sys\n
import google.api_core as api_core\n
from google.cloud.firestore_v1 import gapic_version as package_version
[\s\S]*?"WriteResult",\n\)
Expand Down Expand Up @@ -349,7 +348,6 @@ replacements:
"packages/google-cloud-firestore/google/cloud/firestore_admin_v1/__init__.py",
]
before: |
import sys\n
import google.api_core as api_core\n
from google.cloud.firestore_admin_v1 import gapic_version as package_version
[\s\S]*?"WeeklyRecurrence",\n\)
Expand Down
12 changes: 6 additions & 6 deletions .librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ replacements:
]
before: |
dependencies = \[
"google-api-core\[grpc\] >= 2.25.0, <3.0.0",
"google-api-core\[grpc\] >= 2.28.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.59.0, < 2.0.0",
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand Down Expand Up @@ -210,10 +210,10 @@ replacements:
packages/google-cloud-automl/testing/constraints-3.10.txt,
]
before: |
google-api-core==2.25.0
google-api-core==2.28.0
google-auth==2.14.1
after: |
google-api-core==2.25.0
google-api-core==2.28.0
google-cloud-storage==2.14.0
libcst==0.2.5
pandas==1.3.4
Expand Down Expand Up @@ -424,10 +424,10 @@ replacements:
"packages/google-cloud-monitoring/testing/constraints-3.10.txt",
]
before: |
google-api-core==2.25.0
google-api-core==2.28.0
google-auth==2.14.1
after: |
google-api-core==2.25.0
google-api-core==2.28.0
pandas==1.3.4
numpy==1.21.3
google-auth==2.14.1
Expand Down
1 change: 0 additions & 1 deletion .librarian/generator-input/client-post-processing/logging-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ replacements:
"packages/google-cloud-logging/google/cloud/logging_v2/__init__.py",
]
before: |
import sys\n
import google.api_core as api_core
[\s\S]*?"WriteLogEntriesResponse",\n\)
after: |
Expand Down
33 changes: 0 additions & 33 deletions .librarian/generator-input/client-post-processing/remove-unused-imports.yaml
View file
Open in desktop

This file was deleted.

40 changes: 2 additions & 38 deletions .librarian/generator-input/client-post-processing/spanner-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,42 +95,6 @@ replacements:
after: |
\g<1> metrics_interceptor=mock.ANY,
count: 1
# Temporary patch until gapic-generator 1.38 or newer is released.
# From https://github.com/googleapis/google-cloud-python/pull/17838
- paths:
- packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
- packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
- packages/google-cloud-spanner/tests/unit/gapic/spanner_v1/test_spanner.py
before: |
for config_data, expected_cert_source in test_cases:
\ env = os.environ.copy\(\)
\ env.pop\("GOOGLE_API_USE_CLIENT_CERTIFICATE", None\)
\ with mock.patch.dict\(os.environ, env, clear=True\):
after: |
for config_data, expected_cert_source in test_cases:
env = os.environ.copy()
env.pop("GOOGLE_API_USE_CLIENT_CERTIFICATE", None)
env.pop("CLOUDSDK_CONTEXT_AWARE_USE_CLIENT_CERTIFICATE", None)
with mock.patch.dict(os.environ, env, clear=True):
count: 3
# Temporary patch until gapic-generator 1.38 or newer is released.
# From https://github.com/googleapis/google-cloud-python/pull/17838
- paths:
- packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
- packages/google-cloud-spanner/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
- packages/google-cloud-spanner/tests/unit/gapic/spanner_v1/test_spanner.py
before: |
for config_data, expected_cert_source in test_cases:
\ env = os.environ.copy\(\)
\ env.pop\("GOOGLE_API_USE_CLIENT_CERTIFICATE", ""\)
\ with mock.patch.dict\(os.environ, env, clear=True\):
after: |
for config_data, expected_cert_source in test_cases:
env = os.environ.copy()
env.pop("GOOGLE_API_USE_CLIENT_CERTIFICATE", "")
env.pop("CLOUDSDK_CONTEXT_AWARE_USE_CLIENT_CERTIFICATE", "")
with mock.patch.dict(os.environ, env, clear=True):
count: 3
- paths:
- packages/google-cloud-spanner/tests/unit/gapic/spanner_v1/test_spanner.py
# Group 1: Captures ONLY the spaces/tabs before the text
Expand Down Expand Up @@ -189,7 +153,7 @@ replacements:
before: '(?s)dependencies = \[.*?\]\nextras = \{\s*\}'
after: |
dependencies = [
"google-api-core[grpc] >= 2.25.0, <3.0.0",
"google-api-core[grpc] >= 2.28.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",
Expand Down Expand Up @@ -285,7 +249,7 @@ replacements:
summary_overview.md
count: 1
- paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/__init__.py]
before: '(?s)import sys\n\nimport google\.api_core as api_core.*'
before: '(?s)import google\.api_core as api_core.*'
after: |
from __future__ import absolute_import

Expand Down
2 changes: 1 addition & 1 deletion .librarian/generator-input/client-post-processing/storage-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ replacements:
packages/google-cloud-storage/testing/constraints-3.10.txt
]
before: |
google-api-core==2.25.0
google-api-core==2.28.0
google-auth==2.14.1
grpcio==1.59.0
proto-plus==1.26.1
Expand Down
27 changes: 0 additions & 27 deletions .librarian/generator-input/client-post-processing/temporary-post-processing.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion librarian.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tools:
version: 23.7.0
package: black[jupyter]==23.7.0
- name: gapic-generator
version: 1.37.1
version: 1.38.0
- name: isort
version: 5.11.0
- name: nox
Expand Down
Loading