chore: complete migration of google-cloud-spanner (#16685)

No changes required other than regeneration. The diffs here are due to
reformatting hand-written tests and samples.

Fixes googleapis/librarian#5338

Author: jskeet

librarian.yaml

@@ -3501,7 +3501,6 @@ libraries:
       - docs/spanner_v1/table.rst
       - docs/spanner_v1/transaction.rst
       - tests/unit/gapic/conftest.py
-    skip_generate: true
     python:
       library_type: GAPIC_COMBO
       opt_args_by_api:

packages/google-cloud-spanner/.repo-metadata.json

@@ -1,18 +1,16 @@
 {
-    "name": "spanner",
-    "name_pretty": "Cloud Spanner",
-    "product_documentation": "https://cloud.google.com/spanner/docs/",
+    "api_description": "is the world's first fully managed relational database service \nto offer both strong consistency and horizontal scalability for \nmission-critical online transaction processing (OLTP) applications. With Cloud \nSpanner you enjoy all the traditional benefits of a relational database; but \nunlike any other relational database service, Cloud Spanner scales horizontally \nto hundreds or thousands of servers to handle the biggest transactional \nworkloads.",
+    "api_id": "spanner.googleapis.com",
+    "api_shortname": "spanner",
     "client_documentation": "https://cloud.google.com/python/docs/reference/spanner/latest",
+    "default_version": "v1",
+    "distribution_name": "google-cloud-spanner",
     "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
-    "release_level": "stable",
     "language": "python",
     "library_type": "GAPIC_COMBO",
-    "repo": "googleapis/google-cloud-python",
-    "distribution_name": "google-cloud-spanner",
-    "api_id": "spanner.googleapis.com",
-    "requires_billing": true,
-    "default_version": "v1",
-    "codeowner_team": "@googleapis/spanner-team",
-    "api_shortname": "spanner",
-    "api_description": "is the world's first fully managed relational database service \nto offer both strong consistency and horizontal scalability for \nmission-critical online transaction processing (OLTP) applications. With Cloud \nSpanner you enjoy all the traditional benefits of a relational database; but \nunlike any other relational database service, Cloud Spanner scales horizontally \nto hundreds or thousands of servers to handle the biggest transactional \nworkloads."
-}
+    "name": "spanner",
+    "name_pretty": "Cloud Spanner",
+    "product_documentation": "https://cloud.google.com/spanner/docs/",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
+}

packages/google-cloud-spanner/benchmark/benchwrapper/proto/spanner_pb2.py

@@ -1,4 +1,19 @@
 # -*- coding: utf-8 -*-
+
+# Copyright 2025 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.
+
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: benchmark/benchwrapper/proto/spanner.proto
 """Generated protocol buffer code."""

packages/google-cloud-spanner/samples/samples/archived/backup_snippet.py

@@ -127,8 +127,7 @@ def create_backup_with_encryption_key(
     instance_id, database_id, backup_id, kms_key_name
 ):
     """Creates a backup for a database using a Customer Managed Encryption Key (CMEK)."""
-    from google.cloud.spanner_admin_database_v1 import \
-        CreateBackupEncryptionConfig
+    from google.cloud.spanner_admin_database_v1 import CreateBackupEncryptionConfig
 
     spanner_client = spanner.Client()
     instance = spanner_client.instance(instance_id)
@@ -187,8 +186,7 @@ def create_database_with_version_retention_period(
         + "  AlbumTitle   STRING(MAX)"
         + ") PRIMARY KEY (SingerId, AlbumId),"
         + "  INTERLEAVE IN PARENT Singers ON DELETE CASCADE",
-        "ALTER DATABASE `{}`"
-        " SET OPTIONS (version_retention_period = '{}')".format(
+        "ALTER DATABASE `{}` SET OPTIONS (version_retention_period = '{}')".format(
             database_id, retention_period
         ),
     ]
@@ -396,8 +394,7 @@ def restore_database_with_encryption_key(
     instance_id, new_database_id, backup_id, kms_key_name
 ):
     """Restores a database from a backup using a Customer Managed Encryption Key (CMEK)."""
-    from google.cloud.spanner_admin_database_v1 import \
-        RestoreDatabaseEncryptionConfig
+    from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
 
     spanner_client = spanner.Client()
     instance = spanner_client.instance(instance_id)

packages/google-cloud-spanner/samples/samples/archived/backup_snippet_test.py

@@ -91,8 +91,10 @@ def test_create_backup_with_encryption_key(
     assert kms_key_name in out
 
 
-@pytest.mark.skip(reason="same test passes on unarchived test suite, "
-                         "but fails here. Needs investigation")
+@pytest.mark.skip(
+    reason="same test passes on unarchived test suite, "
+    "but fails here. Needs investigation"
+)
 @pytest.mark.dependency(depends=["create_backup"])
 @RetryErrors(exception=DeadlineExceeded, max_tries=2)
 def test_restore_database(capsys, instance_id, sample_database):
@@ -103,8 +105,10 @@ def test_restore_database(capsys, instance_id, sample_database):
     assert BACKUP_ID in out
 
 
-@pytest.mark.skip(reason="same test passes on unarchived test suite, "
-                         "but fails here. Needs investigation")
+@pytest.mark.skip(
+    reason="same test passes on unarchived test suite, "
+    "but fails here. Needs investigation"
+)
 @pytest.mark.dependency(depends=["create_backup_with_encryption_key"])
 @RetryErrors(exception=DeadlineExceeded, max_tries=2)
 def test_restore_database_with_encryption_key(

packages/google-cloud-spanner/samples/samples/archived/pg_samples.py

@@ -18,6 +18,7 @@
 Spanner PostgreSql dialect.
 For more information, see the README.rst under /spanner.
 """
+
 from google.cloud import spanner, spanner_admin_database_v1
 from google.cloud.spanner_admin_database_v1.types.common import DatabaseDialect
 

packages/google-cloud-spanner/samples/samples/archived/pg_samples_test.py

@@ -17,9 +17,10 @@
 import pg_samples as samples
 import pytest
 from google.api_core import exceptions
-from google.cloud.spanner_admin_database_v1.types.common import DatabaseDialect
 from test_utils.retry import RetryErrors
 
+from google.cloud.spanner_admin_database_v1.types.common import DatabaseDialect
+
 CREATE_TABLE_SINGERS = """\
 CREATE TABLE Singers (
     SingerId     BIGINT NOT NULL,

packages/google-cloud-spanner/samples/samples/archived/samples.py

@@ -22,10 +22,11 @@
 
 import time
 
-from google.cloud import spanner
 from google.iam.v1 import policy_pb2
 from google.type import expr_pb2
 
+from google.cloud import spanner
+
 OPERATION_TIMEOUT_SECONDS = 240
 
 
@@ -293,8 +294,9 @@ def create_database_with_default_leader(instance_id, database_id, default_leader
             AlbumTitle   STRING(MAX)
         ) PRIMARY KEY (SingerId, AlbumId),
         INTERLEAVE IN PARENT Singers ON DELETE CASCADE""",
-            "ALTER DATABASE {}"
-            " SET OPTIONS (default_leader = '{}')".format(database_id, default_leader),
+            "ALTER DATABASE {} SET OPTIONS (default_leader = '{}')".format(
+                database_id, default_leader
+            ),
         ],
     )
     operation = database.create()
@@ -806,8 +808,9 @@ def update_database_with_default_leader(instance_id, database_id, default_leader
 
     operation = database.update_ddl(
         [
-            "ALTER DATABASE {}"
-            " SET OPTIONS (default_leader = '{}')".format(database_id, default_leader)
+            "ALTER DATABASE {} SET OPTIONS (default_leader = '{}')".format(
+                database_id, default_leader
+            )
         ]
     )
     operation.result(OPERATION_TIMEOUT_SECONDS)

packages/google-cloud-spanner/samples/samples/archived/samples_test.py

@@ -23,11 +23,11 @@
 
 import pytest
 from google.api_core import exceptions
-from google.cloud import spanner
-from google.cloud.spanner_admin_database_v1.types.common import DatabaseDialect
 from test_utils.retry import RetryErrors
 
 import samples
+from google.cloud import spanner
+from google.cloud.spanner_admin_database_v1.types.common import DatabaseDialect
 
 CREATE_TABLE_SINGERS = """\
 CREATE TABLE Singers (

packages/google-cloud-spanner/samples/samples/autocommit_test.py

@@ -4,8 +4,8 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
-import pytest
 from google.api_core.exceptions import Aborted
+import pytest
 from test_utils.retry import RetryErrors
 
 import autocommit