Skip to content
Closed

wip #18025

Show file tree
Hide file tree
Changes from all commits
Commits
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2026 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: Add missing session_service import to google-cloud-ces unit tests
url: https://github.com/googleapis/google-cloud-python/issues/17900
replacements:
- paths: [
packages/google-cloud-ces/tests/unit/gapic/ces_v1beta/test_evaluation_service.py
]
before: |
from google.cloud.ces_v1beta.types import evaluation as gcc_evaluation
after: |
from google.cloud.ces_v1beta.types import evaluation as gcc_evaluation
from google.cloud.ces_v1beta.types import session_service
count: 1
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
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
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
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 Expand Up @@ -253,7 +253,8 @@ replacements:
"UpdateTableRequest",
)
from .overlay import * # noqa: F403
# TODO: noqa: E402 needed because overlay import is appended after __all__
from .overlay import * # noqa: E402, F403
__all__ += overlay.__all__ # noqa: F405
count: 1
Expand Down
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
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
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
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

This file was deleted.

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
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
Loading