Merge branch 'main' into remove-unused-files

Author: parthea

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:5581906b957284864632cde4e9c51d1cc66b0094990b27e689132fe5cd036046
-# created: 2025-03-05
+  digest: sha256:710b70faff81151657d89db6e028c23a1051787598c8276bdd8eef25c92da8ab
+# created: 2025-04-10T17:48:54.829145676Z

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "2.20.2"
+    ".": "2.21.0"
 }

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 [1]: https://pypi.org/project/google-cloud-datastore/#history
 
+## [2.21.0](https://github.com/googleapis/python-datastore/compare/v2.20.2...v2.21.0) (2025-04-10)
+
+
+### Features
+
+* Add REST Interceptors which support reading metadata ([7be9c4c](https://github.com/googleapis/python-datastore/commit/7be9c4c594af2c2414e394b8bfe62574b58ef337))
+* Add support for opt-in debug logging ([7be9c4c](https://github.com/googleapis/python-datastore/commit/7be9c4c594af2c2414e394b8bfe62574b58ef337))
+
+
+### Bug Fixes
+
+* Allow protobuf 6.x ([#598](https://github.com/googleapis/python-datastore/issues/598)) ([7c1171b](https://github.com/googleapis/python-datastore/commit/7c1171bf657f7cf4d1404e19611f6c874a8998ca))
+* Backwards-compatibility for previous meaning format ([#603](https://github.com/googleapis/python-datastore/issues/603)) ([ed92e8e](https://github.com/googleapis/python-datastore/commit/ed92e8e54a9e0f44302efee89a30a322d0a73636))
+* Fix typing issue with gRPC metadata when key ends in -bin ([7be9c4c](https://github.com/googleapis/python-datastore/commit/7be9c4c594af2c2414e394b8bfe62574b58ef337))
+
 ## [2.20.2](https://github.com/googleapis/python-datastore/compare/v2.20.1...v2.20.2) (2024-12-12)
 
 

README.rst

@@ -166,7 +166,7 @@ Code-Based Examples
 
     import logging
     
-    from google.cloud.translate_v3 import translate
+    from google.cloud import library_v1
     
     base_logger = logging.getLogger("google")
     base_logger.addHandler(logging.StreamHandler())
@@ -178,7 +178,7 @@ Code-Based Examples
 
     import logging
     
-    from google.cloud.translate_v3 import translate
+    from google.cloud import library_v1
     
     base_logger = logging.getLogger("google.cloud.library_v1")
     base_logger.addHandler(logging.StreamHandler())

google/cloud/datastore/gapic_version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.20.2"  # {x-release-please-version}
+__version__ = "2.21.0"  # {x-release-please-version}

google/cloud/datastore/helpers.py

@@ -18,6 +18,7 @@
 """
 
 import datetime
+import itertools
 
 from google.protobuf import struct_pb2
 from google.type import latlng_pb2
@@ -182,7 +183,15 @@ def _set_pb_meaning_from_entity(entity, name, value, value_pb, is_list=False):
         return
     elif is_list:
         # for lists, set meaning on the root pb and on each sub-element
-        root_meaning, sub_meaning_list = meaning
+        if isinstance(meaning, tuple):
+            root_meaning, sub_meaning_list = meaning
+        else:
+            # if meaning isn't a tuple, fall back to pre-v2.20.2 meaning format
+            root_meaning = None
+            if isinstance(meaning, list):
+                sub_meaning_list = meaning
+            else:
+                sub_meaning_list = itertools.repeat(meaning)
         if root_meaning is not None:
             value_pb.meaning = root_meaning
         if sub_meaning_list:

google/cloud/datastore/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.20.2"
+__version__ = "2.21.0"

google/cloud/datastore_admin/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2024 Google LLC
+# 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.

google/cloud/datastore_admin/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.20.2"  # {x-release-please-version}
+__version__ = "2.21.0"  # {x-release-please-version}

google/cloud/datastore_admin_v1/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2024 Google LLC
+# 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.