Skip to content
Draft
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
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 @@ -343,7 +343,7 @@ replacements:
packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py,
]
before: |
\)\n
\}\n\n
__all__ = \(
"MetastorePartitionServiceAsyncClient",
"BatchCreateMetastorePartitionsRequest",
Expand All @@ -369,7 +369,7 @@ replacements:
"UpdateMetastorePartitionRequest",
\)
after: |
)
}
count: 2
# 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,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 @@ -252,14 +252,18 @@ replacements:
- paths: [
packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py
]
before: '"UpdateTableRequest",\n\)\n\Z'
before: |
"UpdateTableRequest",\n\)\n
api_core.check_python_version\("google.cloud.bigtable_admin_v2"\)
after: |
"UpdateTableRequest",
)

from .overlay import * # noqa: F403

__all__ += overlay.__all__ # noqa: F405

api_core.check_python_version("google.cloud.bigtable_admin_v2")
count: 1
- paths: [
packages/google-cloud-bigtable/google/cloud/bigtable_admin/__init__.py
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,11 +34,11 @@ 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\)
after: |
import google.api_core as api_core\n
"""Python idiomatic client for Google Cloud Firestore."""\n
from google.cloud.firestore_v1 import gapic_version as package_version

Expand Down Expand Up @@ -349,11 +349,11 @@ 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\)
after: |
import google.api_core as api_core\n
from .services.firestore_admin import FirestoreAdminClient
from .types.field import Field
from .types.firestore_admin import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ replacements:
packages/google-cloud-vision/google/cloud/vision_v1p4beta1/__init__.py,
]
before: |
\)\n
from .types.web_detection import WebDetection\n
__all__ = \(
after: |
)\n\n
from .types.web_detection import WebDetection\n\n
@add_single_feature_methods
class ImageAnnotatorClient(VisionHelpers, IacImageAnnotatorClient):
__doc__ = IacImageAnnotatorClient.__doc__
Expand All @@ -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 @@ -209,10 +209,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
pandas==1.3.4
# numpy is a dependency of pandas
Expand Down Expand Up @@ -422,10 +422,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,12 +400,13 @@ 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: |
from __future__ import absolute_import

import google.api_core as api_core

from google.cloud.logging_v2 import gapic_version as package_version

__version__ = package_version.__version__
Expand Down
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 All @@ -649,7 +649,7 @@ replacements:
google-auth==2.26.1
# cryptography is a direct dependency of google-auth
cryptography==38.0.0
google-api-core==2.27.0
google-api-core==2.28.0
google-cloud-core==2.4.2
google-resumable-media==2.7.2
grpcio==1.59.0
Expand Down
Loading