Merge branch 'main' into ci_sharding

daniel-sanche · web-flow · commit eefea36070a8 · 2026-07-27T09:27:26.000-07:00
diff --git a/.github/workflows/sqlalchemy-spanner-compliance-tests-against-emulator.yml b/.github/workflows/sqlalchemy-spanner-compliance-tests-against-emulator.yml
@@ -0,0 +1,66 @@
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    paths:
+      - 'packages/sqlalchemy-spanner/**'
+      - '.github/workflows/sqlalchemy-spanner-compliance-tests-against-emulator.yml'
+  push:
+    branches:
+      - main
+    paths:
+      - 'packages/sqlalchemy-spanner/**'
+      - '.github/workflows/sqlalchemy-spanner-compliance-tests-against-emulator.yml'
+
+defaults:
+  run:
+    working-directory: packages/sqlalchemy-spanner
+
+name: Run SQLAlchemy Spanner compliance tests against emulator
+jobs:
+  check_changes:
+    runs-on: ubuntu-latest
+    outputs:
+      run_sqlalchemy_spanner: ${{ steps.filter.outputs.sqlalchemy_spanner }}
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          persist-credentials: false
+      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        id: filter
+        with:
+          filters: |
+            sqlalchemy_spanner:
+              - 'packages/sqlalchemy-spanner/**'
+              - '.github/workflows/sqlalchemy-spanner-compliance-tests-against-emulator.yml'
+
+  compliance-tests:
+    needs: check_changes
+    if: ${{ needs.check_changes.outputs.run_sqlalchemy_spanner == 'true' }}
+    runs-on: ubuntu-latest
+
+    services:
+      emulator:
+        image: gcr.io/cloud-spanner-emulator/emulator:latest # zizmor: ignore[unpinned-images]
+        ports:
+          - 9010:9010
+          - 9020:9020
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          persist-credentials: false
+      - name: Set up Python 3.14
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
+        with:
+          python-version: "3.14"
+      - name: Install nox
+        run: python -m pip install nox
+      - name: Run nox compliance_test_20
+        run: nox -s compliance_test_20
+        env:
+          SPANNER_EMULATOR_HOST: localhost:9010
+          GOOGLE_CLOUD_PROJECT: emulator-test-project
+          GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true
diff --git a/librarian.yaml b/librarian.yaml
@@ -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:
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/__init__.py
@@ -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,
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/async_client.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/async_client.py
@@ -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",)
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/client.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/client.py
@@ -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",)
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/base.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/base.py
@@ -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):
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/rest.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/rest.py
@@ -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:
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/async_client.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/async_client.py
@@ -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",)
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/client.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/client.py
@@ -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",)
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/base.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/base.py
@@ -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):
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/rest.py b/packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/rest.py
@@ -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:
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/__init__.py b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/__init__.py
@@ -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,
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/async_client.py b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/async_client.py
@@ -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",)
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/client.py b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/client.py
@@ -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",)
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/transports/base.py b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/transports/base.py
@@ -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):
diff --git a/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/transports/rest.py b/packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/transports/rest.py
@@ -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:
diff --git a/packages/google-cloud-bigtable/noxfile.py b/packages/google-cloud-bigtable/noxfile.py
@@ -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",
@@ -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",
     )
 
 
diff --git a/packages/google-cloud-bigtable/setup.py b/packages/google-cloud-bigtable/setup.py
@@ -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",
diff --git a/packages/google-cloud-bigtable/testing/constraints-3.10.txt b/packages/google-cloud-bigtable/testing/constraints-3.10.txt
@@ -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
diff --git a/packages/google-cloud-bigtable/tests/unit/data/_async/test_mutations_batcher.py b/packages/google-cloud-bigtable/tests/unit/data/_async/test_mutations_batcher.py
@@ -923,8 +923,12 @@ async def test_timer_flush_end_to_end(self):
                 for m in mutations:
                     await instance.append(m)
                 assert instance._entries_processed_since_last_raise == 0
-                # let flush trigger due to timer
-                await CrossSync.sleep(0.1)
+                # Poll in short intervals to wait for the background timer flush to finish,
+                # avoiding timing/scheduling flakiness on slower or heavily loaded environments.
+                for _ in range(50):
+                    if instance._entries_processed_since_last_raise == num_mutations:
+                        break
+                    await CrossSync.sleep(0.05)
                 assert instance._entries_processed_since_last_raise == num_mutations
 
     @CrossSync.pytest
diff --git a/packages/google-cloud-bigtable/tests/unit/data/_sync_autogen/test_mutations_batcher.py b/packages/google-cloud-bigtable/tests/unit/data/_sync_autogen/test_mutations_batcher.py
@@ -804,7 +804,10 @@ def test_timer_flush_end_to_end(self):
                 for m in mutations:
                     instance.append(m)
                 assert instance._entries_processed_since_last_raise == 0
-                CrossSync._Sync_Impl.sleep(0.1)
+                for _ in range(50):
+                    if instance._entries_processed_since_last_raise == num_mutations:
+                        break
+                    CrossSync._Sync_Impl.sleep(0.05)
                 assert instance._entries_processed_since_last_raise == num_mutations
 
     def test__execute_mutate_rows(self):
diff --git a/packages/google-cloud-bigtable/tests/unit/gapic/bigtable_admin_v2/test_bigtable_instance_admin.py b/packages/google-cloud-bigtable/tests/unit/gapic/bigtable_admin_v2/test_bigtable_instance_admin.py
@@ -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}
                     ):
@@ -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}
                     ):
diff --git a/packages/google-cloud-bigtable/tests/unit/gapic/bigtable_admin_v2/test_bigtable_table_admin.py b/packages/google-cloud-bigtable/tests/unit/gapic/bigtable_admin_v2/test_bigtable_table_admin.py
@@ -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}
                     ):
@@ -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}
                     ):
diff --git a/packages/google-cloud-bigtable/tests/unit/gapic/bigtable_v2/test_bigtable.py b/packages/google-cloud-bigtable/tests/unit/gapic/bigtable_v2/test_bigtable.py
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_dbapi/parse_utils.py b/packages/google-cloud-spanner/google/cloud/spanner_dbapi/parse_utils.py
diff --git a/packages/google-cloud-spanner/tests/unit/spanner_dbapi/test_parse_utils.py b/packages/google-cloud-spanner/tests/unit/spanner_dbapi/test_parse_utils.py
diff --git a/packages/sqlalchemy-spanner/.coveragerc b/packages/sqlalchemy-spanner/.coveragerc
diff --git a/packages/sqlalchemy-spanner/google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py b/packages/sqlalchemy-spanner/google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py
diff --git a/packages/sqlalchemy-spanner/noxfile.py b/packages/sqlalchemy-spanner/noxfile.py
diff --git a/packages/sqlalchemy-spanner/tests/unit/test_dialect.py b/packages/sqlalchemy-spanner/tests/unit/test_dialect.py

Original file line number	Diff line number	Diff line change
`@@ -4343,9 +4343,7 @@ async def __aexit__(self, exc_type, exc, tb):`
`4343`	`4343`	`DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(`
`4344`	`4344`	`gapic_version=package_version.__version__`
`4345`	`4345`	`)`
`4346`		`-`
`4347`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`4348`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`4346`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`4349`	`4347`
`4350`	`4348`
`4351`	`4349`	`__all__ = ("BigtableInstanceAdminAsyncClient",)`
Original file line number	Diff line number	Diff line change
`@@ -4832,8 +4832,6 @@ def __exit__(self, type, value, traceback):`
`4832`	`4832`	`DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(`
`4833`	`4833`	`gapic_version=package_version.__version__`
`4834`	`4834`	`)`
`4835`		`-`
`4836`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`4837`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`4835`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`4838`	`4836`
`4839`	`4837`	`__all__ = ("BigtableInstanceAdminClient",)`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@`
`35`	`35`	`DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(`
`36`	`36`	`gapic_version=package_version.__version__`
`37`	`37`	`)`
`38`		`-`
`39`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`40`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`38`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`41`	`39`
`42`	`40`
`43`	`41`	`class BigtableInstanceAdminTransport(abc.ABC):`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@`
`57`	`57`	`rest_version=f"requests@{requests_version}",`
`58`	`58`	`)`
`59`	`59`
`60`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`61`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`60`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`62`	`61`
`63`	`62`
`64`	`63`	`class BigtableInstanceAdminRestInterceptor:`
Original file line number	Diff line number	Diff line change
`@@ -4961,9 +4961,7 @@ async def __aexit__(self, exc_type, exc, tb):`
`4961`	`4961`	`DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(`
`4962`	`4962`	`gapic_version=package_version.__version__`
`4963`	`4963`	`)`
`4964`		`-`
`4965`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`4966`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`4964`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`4967`	`4965`
`4968`	`4966`
`4969`	`4967`	`__all__ = ("BaseBigtableTableAdminAsyncClient",)`
Original file line number	Diff line number	Diff line change
`@@ -5449,8 +5449,6 @@ def __exit__(self, type, value, traceback):`
`5449`	`5449`	`DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(`
`5450`	`5450`	`gapic_version=package_version.__version__`
`5451`	`5451`	`)`
`5452`		`-`
`5453`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`5454`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`5452`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`5455`	`5453`
`5456`	`5454`	`__all__ = ("BaseBigtableTableAdminClient",)`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@`
`36`	`36`	`DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(`
`37`	`37`	`gapic_version=package_version.__version__`
`38`	`38`	`)`
`39`		`-`
`40`		`-if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER`
`41`		`- DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
	`39`	`+DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__`
`42`	`40`
`43`	`41`
`44`	`42`	`class BigtableTableAdminTransport(abc.ABC):`