Merge branch 'main' into gilContentionLazy

sinhasubham · web-flow · commit b0e027bb8c7f · 2025-10-09T15:55:42.000+05:30
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "3.57.0"
+    ".": "3.58.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 [1]: https://pypi.org/project/google-cloud-spanner/#history
 
+## [3.58.0](https://github.com/googleapis/python-spanner/compare/v3.57.0...v3.58.0) (2025-09-10)
+
+
+### Features
+
+* **spanner:** Support setting read lock mode ([#1404](https://github.com/googleapis/python-spanner/issues/1404)) ([ee24c6e](https://github.com/googleapis/python-spanner/commit/ee24c6ee2643bc74d52e9f0a924b80a830fa2697))
+
+
+### Dependencies
+
+* Remove Python 3.7 and 3.8 as supported runtimes ([#1395](https://github.com/googleapis/python-spanner/issues/1395)) ([fc93792](https://github.com/googleapis/python-spanner/commit/fc9379232224f56d29d2e36559a756c05a5478ff))
+
 ## [3.57.0](https://github.com/googleapis/python-spanner/compare/v3.56.0...v3.57.0) (2025-08-14)
 
 
diff --git a/google/cloud/spanner_admin_database_v1/gapic_version.py b/google/cloud/spanner_admin_database_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.57.0"  # {x-release-please-version}
+__version__ = "3.58.0"  # {x-release-please-version}
diff --git a/google/cloud/spanner_admin_instance_v1/gapic_version.py b/google/cloud/spanner_admin_instance_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.57.0"  # {x-release-please-version}
+__version__ = "3.58.0"  # {x-release-please-version}
diff --git a/google/cloud/spanner_v1/gapic_version.py b/google/cloud/spanner_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.57.0"  # {x-release-please-version}
+__version__ = "3.58.0"  # {x-release-please-version}
diff --git a/samples/generated_samples/snippet_metadata_google.spanner.admin.database.v1.json b/samples/generated_samples/snippet_metadata_google.spanner.admin.database.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-spanner-admin-database",
-    "version": "0.1.0"
+    "version": "3.58.0"
   },
   "snippets": [
     {
diff --git a/samples/generated_samples/snippet_metadata_google.spanner.admin.instance.v1.json b/samples/generated_samples/snippet_metadata_google.spanner.admin.instance.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-spanner-admin-instance",
-    "version": "0.1.0"
+    "version": "3.58.0"
   },
   "snippets": [
     {
diff --git a/samples/generated_samples/snippet_metadata_google.spanner.v1.json b/samples/generated_samples/snippet_metadata_google.spanner.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-spanner",
-    "version": "0.1.0"
+    "version": "3.58.0"
   },
   "snippets": [
     {
diff --git a/samples/samples/backup_sample.py b/samples/samples/backup_sample.py
@@ -116,6 +116,7 @@ def create_backup_with_encryption_key(
 
 # [END spanner_create_backup_with_encryption_key]
 
+
 # [START spanner_create_backup_with_MR_CMEK]
 def create_backup_with_multiple_kms_keys(
     instance_id, database_id, backup_id, kms_key_names
@@ -246,6 +247,7 @@ def restore_database_with_encryption_key(
 
 # [END spanner_restore_backup_with_encryption_key]
 
+
 # [START spanner_restore_backup_with_MR_CMEK]
 def restore_database_with_multiple_kms_keys(
     instance_id, new_database_id, backup_id, kms_key_names
@@ -697,6 +699,7 @@ def copy_backup(instance_id, backup_id, source_backup_path):
 
 # [END spanner_copy_backup]
 
+
 # [START spanner_copy_backup_with_MR_CMEK]
 def copy_backup_with_multiple_kms_keys(
     instance_id, backup_id, source_backup_path, kms_key_names
diff --git a/samples/samples/backup_sample_test.py b/samples/samples/backup_sample_test.py
@@ -93,8 +93,7 @@ def test_create_backup_with_encryption_key(
     assert kms_key_name in out
 
 
-@pytest.mark.skip(reason="skipped since the KMS keys are not added on test "
-                         "project")
+@pytest.mark.skip(reason="skipped since the KMS keys are not added on test " "project")
 @pytest.mark.dependency(name="create_backup_with_multiple_kms_keys")
 def test_create_backup_with_multiple_kms_keys(
     capsys,
@@ -116,8 +115,7 @@ def test_create_backup_with_multiple_kms_keys(
     assert kms_key_names[2] in out
 
 
-@pytest.mark.skip(reason="skipped since the KMS keys are not added on test "
-                         "project")
+@pytest.mark.skip(reason="skipped since the KMS keys are not added on test " "project")
 @pytest.mark.dependency(depends=["create_backup_with_multiple_kms_keys"])
 def test_copy_backup_with_multiple_kms_keys(
     capsys, multi_region_instance_id, spanner_client, kms_key_names
@@ -164,8 +162,7 @@ def test_restore_database_with_encryption_key(
     assert kms_key_name in out
 
 
-@pytest.mark.skip(reason="skipped since the KMS keys are not added on test "
-                         "project")
+@pytest.mark.skip(reason="skipped since the KMS keys are not added on test " "project")
 @pytest.mark.dependency(depends=["create_backup_with_multiple_kms_keys"])
 @RetryErrors(exception=DeadlineExceeded, max_tries=2)
 def test_restore_database_with_multiple_kms_keys(
diff --git a/samples/samples/backup_schedule_samples.py b/samples/samples/backup_schedule_samples.py
@@ -24,25 +24,26 @@
 
 # [START spanner_create_full_backup_schedule]
 def create_full_backup_schedule(
-        instance_id: str,
-        database_id: str,
-        schedule_id: str,
+    instance_id: str,
+    database_id: str,
+    schedule_id: str,
 ) -> None:
     from datetime import timedelta
     from google.cloud import spanner
-    from google.cloud.spanner_admin_database_v1.types import \
-        backup_schedule as backup_schedule_pb
-    from google.cloud.spanner_admin_database_v1.types import \
-        CreateBackupEncryptionConfig, FullBackupSpec
+    from google.cloud.spanner_admin_database_v1.types import (
+        backup_schedule as backup_schedule_pb,
+    )
+    from google.cloud.spanner_admin_database_v1.types import (
+        CreateBackupEncryptionConfig,
+        FullBackupSpec,
+    )
 
     client = spanner.Client()
     database_admin_api = client.database_admin_api
 
     request = backup_schedule_pb.CreateBackupScheduleRequest(
         parent=database_admin_api.database_path(
-            client.project,
-            instance_id,
-            database_id
+            client.project, instance_id, database_id
         ),
         backup_schedule_id=schedule_id,
         backup_schedule=backup_schedule_pb.BackupSchedule(
@@ -62,30 +63,32 @@ def create_full_backup_schedule(
     response = database_admin_api.create_backup_schedule(request)
     print(f"Created full backup schedule: {response}")
 
+
 # [END spanner_create_full_backup_schedule]
 
 
 # [START spanner_create_incremental_backup_schedule]
 def create_incremental_backup_schedule(
-        instance_id: str,
-        database_id: str,
-        schedule_id: str,
+    instance_id: str,
+    database_id: str,
+    schedule_id: str,
 ) -> None:
     from datetime import timedelta
     from google.cloud import spanner
-    from google.cloud.spanner_admin_database_v1.types import \
-        backup_schedule as backup_schedule_pb
-    from google.cloud.spanner_admin_database_v1.types import \
-        CreateBackupEncryptionConfig, IncrementalBackupSpec
+    from google.cloud.spanner_admin_database_v1.types import (
+        backup_schedule as backup_schedule_pb,
+    )
+    from google.cloud.spanner_admin_database_v1.types import (
+        CreateBackupEncryptionConfig,
+        IncrementalBackupSpec,
+    )
 
     client = spanner.Client()
     database_admin_api = client.database_admin_api
 
     request = backup_schedule_pb.CreateBackupScheduleRequest(
         parent=database_admin_api.database_path(
-            client.project,
-            instance_id,
-            database_id
+            client.project, instance_id, database_id
         ),
         backup_schedule_id=schedule_id,
         backup_schedule=backup_schedule_pb.BackupSchedule(
@@ -105,14 +108,16 @@ def create_incremental_backup_schedule(
     response = database_admin_api.create_backup_schedule(request)
     print(f"Created incremental backup schedule: {response}")
 
+
 # [END spanner_create_incremental_backup_schedule]
 
 
 # [START spanner_list_backup_schedules]
 def list_backup_schedules(instance_id: str, database_id: str) -> None:
     from google.cloud import spanner
-    from google.cloud.spanner_admin_database_v1.types import \
-        backup_schedule as backup_schedule_pb
+    from google.cloud.spanner_admin_database_v1.types import (
+        backup_schedule as backup_schedule_pb,
+    )
 
     client = spanner.Client()
     database_admin_api = client.database_admin_api
@@ -128,18 +133,20 @@ def list_backup_schedules(instance_id: str, database_id: str) -> None:
     for backup_schedule in database_admin_api.list_backup_schedules(request):
         print(f"Backup schedule: {backup_schedule}")
 
+
 # [END spanner_list_backup_schedules]
 
 
 # [START spanner_get_backup_schedule]
 def get_backup_schedule(
-        instance_id: str,
-        database_id: str,
-        schedule_id: str,
+    instance_id: str,
+    database_id: str,
+    schedule_id: str,
 ) -> None:
     from google.cloud import spanner
-    from google.cloud.spanner_admin_database_v1.types import \
-        backup_schedule as backup_schedule_pb
+    from google.cloud.spanner_admin_database_v1.types import (
+        backup_schedule as backup_schedule_pb,
+    )
 
     client = spanner.Client()
     database_admin_api = client.database_admin_api
@@ -156,21 +163,24 @@ def get_backup_schedule(
     response = database_admin_api.get_backup_schedule(request)
     print(f"Backup schedule: {response}")
 
+
 # [END spanner_get_backup_schedule]
 
 
 # [START spanner_update_backup_schedule]
 def update_backup_schedule(
-        instance_id: str,
-        database_id: str,
-        schedule_id: str,
+    instance_id: str,
+    database_id: str,
+    schedule_id: str,
 ) -> None:
     from datetime import timedelta
     from google.cloud import spanner
-    from google.cloud.spanner_admin_database_v1.types import \
-        backup_schedule as backup_schedule_pb
-    from google.cloud.spanner_admin_database_v1.types import \
-        CreateBackupEncryptionConfig
+    from google.cloud.spanner_admin_database_v1.types import (
+        backup_schedule as backup_schedule_pb,
+    )
+    from google.cloud.spanner_admin_database_v1.types import (
+        CreateBackupEncryptionConfig,
+    )
     from google.protobuf.field_mask_pb2 import FieldMask
 
     client = spanner.Client()
@@ -206,18 +216,20 @@ def update_backup_schedule(
     response = database_admin_api.update_backup_schedule(request)
     print(f"Updated backup schedule: {response}")
 
+
 # [END spanner_update_backup_schedule]
 
 
 # [START spanner_delete_backup_schedule]
 def delete_backup_schedule(
-        instance_id: str,
-        database_id: str,
-        schedule_id: str,
+    instance_id: str,
+    database_id: str,
+    schedule_id: str,
 ) -> None:
     from google.cloud import spanner
-    from google.cloud.spanner_admin_database_v1.types import \
-        backup_schedule as backup_schedule_pb
+    from google.cloud.spanner_admin_database_v1.types import (
+        backup_schedule as backup_schedule_pb,
+    )
 
     client = spanner.Client()
     database_admin_api = client.database_admin_api
@@ -234,6 +246,7 @@ def delete_backup_schedule(
     database_admin_api.delete_backup_schedule(request)
     print("Deleted backup schedule")
 
+
 # [END spanner_delete_backup_schedule]
 
 
diff --git a/samples/samples/backup_schedule_samples_test.py b/samples/samples/backup_schedule_samples_test.py
diff --git a/samples/samples/pg_snippets.py b/samples/samples/pg_snippets.py
diff --git a/samples/samples/snippets.py b/samples/samples/snippets.py
diff --git a/samples/samples/snippets_test.py b/samples/samples/snippets_test.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "3.57.0"`
	`2`	`+ ".": "3.58.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-__version__ = "3.57.0" # {x-release-please-version}`
	`16`	`+__version__ = "3.58.0" # {x-release-please-version}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`],`
`9`	`9`	`"language": "PYTHON",`
`10`	`10`	`"name": "google-cloud-spanner-admin-database",`
`11`		`- "version": "0.1.0"`
	`11`	`+ "version": "3.58.0"`
`12`	`12`	`},`
`13`	`13`	`"snippets": [`
`14`	`14`	`{`