Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion librarian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ libraries:
apis:
- path: google/bigtable/v2
- path: google/bigtable/admin/v2
skip_generate: true
python:
library_type: GAPIC_COMBO
opt_args_by_api:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@

from importlib import metadata

# PEP 0810: Explicit Lazy Imports
# Python 3.15+ natively intercepts and defers these imports.
# Developers can disable this behavior and force eager imports.
# For more information, see:
# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
# Older Python versions safely ignore this variable.
__lazy_modules__ = {
"google.cloud.bigtable_admin_v2.services.bigtable_instance_admin",
"google.cloud.bigtable_admin_v2.services.bigtable_table_admin",
"google.cloud.bigtable_admin_v2.types.bigtable_instance_admin",
"google.cloud.bigtable_admin_v2.types.bigtable_table_admin",
"google.cloud.bigtable_admin_v2.types.common",
"google.cloud.bigtable_admin_v2.types.instance",
"google.cloud.bigtable_admin_v2.types.table",
"google.cloud.bigtable_admin_v2.types.types",
}


from .services.bigtable_instance_admin import (
BigtableInstanceAdminAsyncClient,
BigtableInstanceAdminClient,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4343,9 +4343,7 @@ async def __aexit__(self, exc_type, exc, tb):
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


__all__ = ("BigtableInstanceAdminAsyncClient",)
Original file line number Diff line number Diff line change
Expand Up @@ -4832,8 +4832,6 @@ def __exit__(self, type, value, traceback):
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__

__all__ = ("BigtableInstanceAdminClient",)
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


class BigtableInstanceAdminTransport(abc.ABC):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@
rest_version=f"requests@{requests_version}",
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


class BigtableInstanceAdminRestInterceptor:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4961,9 +4961,7 @@ async def __aexit__(self, exc_type, exc, tb):
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


__all__ = ("BaseBigtableTableAdminAsyncClient",)
Original file line number Diff line number Diff line change
Expand Up @@ -5449,8 +5449,6 @@ def __exit__(self, type, value, traceback):
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__

__all__ = ("BaseBigtableTableAdminClient",)
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


class BigtableTableAdminTransport(abc.ABC):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@
rest_version=f"requests@{requests_version}",
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


class BigtableTableAdminRestInterceptor:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@

from importlib import metadata

# PEP 0810: Explicit Lazy Imports
# Python 3.15+ natively intercepts and defers these imports.
# Developers can disable this behavior and force eager imports.
# For more information, see:
# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
# Older Python versions safely ignore this variable.
__lazy_modules__ = {
"google.cloud.bigtable_v2.services.bigtable",
"google.cloud.bigtable_v2.types.bigtable",
"google.cloud.bigtable_v2.types.data",
"google.cloud.bigtable_v2.types.feature_flags",
"google.cloud.bigtable_v2.types.peer_info",
"google.cloud.bigtable_v2.types.request_stats",
"google.cloud.bigtable_v2.types.response_params",
"google.cloud.bigtable_v2.types.session",
"google.cloud.bigtable_v2.types.types",
}


from .services.bigtable import BigtableAsyncClient, BigtableClient
from .types.bigtable import (
CheckAndMutateRowRequest,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1750,9 +1750,7 @@ async def __aexit__(self, exc_type, exc, tb):
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


__all__ = ("BigtableAsyncClient",)
Original file line number Diff line number Diff line change
Expand Up @@ -2217,8 +2217,6 @@ def __exit__(self, type, value, traceback):
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__

__all__ = ("BigtableClient",)
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=package_version.__version__
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


class BigtableTransport(abc.ABC):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
rest_version=f"requests@{requests_version}",
)

if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__


class BigtableRestInterceptor:
Expand Down
6 changes: 4 additions & 2 deletions packages/google-cloud-bigtable/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
str(CURRENT_DIRECTORY.parent.parent / "mypy.ini"),
)


# 'docfx' is excluded since it only needs to run in 'docs-presubmit'
nox.options.sessions = [
"unit-3.10",
Expand Down Expand Up @@ -188,7 +187,10 @@ def mypy(session):
)
session.install("google-cloud-testutils")
session.run(
"mypy", f"--config-file={MYPY_CONFIG_FILE}", "-p", "google.cloud.bigtable.data"
"mypy",
f"--config-file={MYPY_CONFIG_FILE}",
"-p",
"google.cloud.bigtable.data",
)


Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-bigtable/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
release_status = "Development Status :: 5 - Production/Stable"

dependencies = [
"google-api-core[grpc] >= 2.24.2, <3.0.0",
"google-api-core[grpc] >= 2.25.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 @@ -4,7 +4,7 @@
# pinning their versions to their lower bounds.
# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
# then this file should have google-cloud-foo==1.14.0
google-api-core==2.24.2
google-api-core==2.25.0
google-cloud-core==2.0.0
grpc-google-iam-v1==0.14.2
google-crc32c==1.6.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,14 @@ def test_bigtable_instance_admin_client_get_mtls_endpoint_and_cert_source(client
config_filename = "mock_certificate_config.json"
config_file_content = json.dumps(config_data)
m = mock.mock_open(read_data=config_file_content)
with mock.patch("builtins.open", m):
with (
mock.patch("builtins.open", m),
mock.patch(
"os.path.exists",
side_effect=lambda path: os.path.basename(path)
== config_filename,
),
):
with mock.patch.dict(
os.environ, {"GOOGLE_API_CERTIFICATE_CONFIG": config_filename}
):
Expand Down Expand Up @@ -1068,7 +1075,14 @@ def test_bigtable_instance_admin_client_get_mtls_endpoint_and_cert_source(client
config_filename = "mock_certificate_config.json"
config_file_content = json.dumps(config_data)
m = mock.mock_open(read_data=config_file_content)
with mock.patch("builtins.open", m):
with (
mock.patch("builtins.open", m),
mock.patch(
"os.path.exists",
side_effect=lambda path: os.path.basename(path)
== config_filename,
),
):
with mock.patch.dict(
os.environ, {"GOOGLE_API_CERTIFICATE_CONFIG": config_filename}
):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,14 @@ def test_base_bigtable_table_admin_client_get_mtls_endpoint_and_cert_source(
config_filename = "mock_certificate_config.json"
config_file_content = json.dumps(config_data)
m = mock.mock_open(read_data=config_file_content)
with mock.patch("builtins.open", m):
with (
mock.patch("builtins.open", m),
mock.patch(
"os.path.exists",
side_effect=lambda path: os.path.basename(path)
== config_filename,
),
):
with mock.patch.dict(
os.environ, {"GOOGLE_API_CERTIFICATE_CONFIG": config_filename}
):
Expand Down Expand Up @@ -1071,7 +1078,14 @@ def test_base_bigtable_table_admin_client_get_mtls_endpoint_and_cert_source(
config_filename = "mock_certificate_config.json"
config_file_content = json.dumps(config_data)
m = mock.mock_open(read_data=config_file_content)
with mock.patch("builtins.open", m):
with (
mock.patch("builtins.open", m),
mock.patch(
"os.path.exists",
side_effect=lambda path: os.path.basename(path)
== config_filename,
),
):
with mock.patch.dict(
os.environ, {"GOOGLE_API_CERTIFICATE_CONFIG": config_filename}
):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,14 @@ def test_bigtable_client_get_mtls_endpoint_and_cert_source(client_class):
config_filename = "mock_certificate_config.json"
config_file_content = json.dumps(config_data)
m = mock.mock_open(read_data=config_file_content)
with mock.patch("builtins.open", m):
with (
mock.patch("builtins.open", m),
mock.patch(
"os.path.exists",
side_effect=lambda path: os.path.basename(path)
== config_filename,
),
):
with mock.patch.dict(
os.environ, {"GOOGLE_API_CERTIFICATE_CONFIG": config_filename}
):
Expand Down Expand Up @@ -964,7 +971,14 @@ def test_bigtable_client_get_mtls_endpoint_and_cert_source(client_class):
config_filename = "mock_certificate_config.json"
config_file_content = json.dumps(config_data)
m = mock.mock_open(read_data=config_file_content)
with mock.patch("builtins.open", m):
with (
mock.patch("builtins.open", m),
mock.patch(
"os.path.exists",
side_effect=lambda path: os.path.basename(path)
== config_filename,
),
):
with mock.patch.dict(
os.environ, {"GOOGLE_API_CERTIFICATE_CONFIG": config_filename}
):
Expand Down
Loading