From 4740819f0b0836645e98c8160c6a4c10982e8563 Mon Sep 17 00:00:00 2001 From: ANSHUL SINGH <72524975+ekanshul@users.noreply.github.com> Date: Wed, 19 Aug 2026 21:10:29 +0530 Subject: [PATCH 1/2] Bump google-cloud-ndb to 2.5.* google-cloud-ndb 2.5.1 adds an optional value=None parameter to future_info() on every _GlobalCache*Batch class and an optional server_op=None parameter to StructuredProperty.IN(). Update the stubs to match so stubtest passes, and drop the type: ignore[override] comments that are no longer needed now that the overrides are compatible with their base classes. Co-Authored-By: Claude Fable 5 --- stubs/google-cloud-ndb/METADATA.toml | 2 +- .../google-cloud-ndb/google/cloud/ndb/_cache.pyi | 16 ++++++++-------- .../google-cloud-ndb/google/cloud/ndb/model.pyi | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/stubs/google-cloud-ndb/METADATA.toml b/stubs/google-cloud-ndb/METADATA.toml index fb13602f4b47..7f93ab49cd2b 100644 --- a/stubs/google-cloud-ndb/METADATA.toml +++ b/stubs/google-cloud-ndb/METADATA.toml @@ -1,4 +1,4 @@ -version = "2.4.*" +version = "2.5.*" upstream-repository = "https://github.com/googleapis/python-ndb" partial-stub = true diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/_cache.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/_cache.pyi index 1047e3028f53..24169f3a47a9 100644 --- a/stubs/google-cloud-ndb/google/cloud/ndb/_cache.pyi +++ b/stubs/google-cloud-ndb/google/cloud/ndb/_cache.pyi @@ -10,7 +10,7 @@ class _GlobalCacheBatch: def idle_callback(self) -> None: ... def done_callback(self, cache_call) -> None: ... def make_call(self) -> None: ... - def future_info(self, key) -> None: ... + def future_info(self, key, value=None) -> None: ... global_get: Incomplete @@ -21,7 +21,7 @@ class _GlobalCacheGetBatch(_GlobalCacheBatch): def add(self, key): ... def done_callback(self, cache_call) -> None: ... def make_call(self): ... - def future_info(self, key): ... + def future_info(self, key, value=None): ... def global_set(key, value, expires: Incomplete | None = ..., read: bool = ...): ... @@ -33,12 +33,12 @@ class _GlobalCacheSetBatch(_GlobalCacheBatch): def done_callback(self, cache_call) -> None: ... def add(self, key, value): ... def make_call(self): ... - def future_info(self, key, value): ... # type: ignore[override] + def future_info(self, key, value=None): ... class _GlobalCacheSetIfNotExistsBatch(_GlobalCacheSetBatch): def add(self, key, value): ... def make_call(self): ... - def future_info(self, key, value): ... # type: ignore[override] + def future_info(self, key, value=None): ... global_delete: Incomplete @@ -48,25 +48,25 @@ class _GlobalCacheDeleteBatch(_GlobalCacheBatch): def __init__(self, ignore_options) -> None: ... def add(self, key): ... def make_call(self): ... - def future_info(self, key): ... + def future_info(self, key, value=None): ... global_watch: Incomplete class _GlobalCacheWatchBatch(_GlobalCacheDeleteBatch): def make_call(self): ... - def future_info(self, key, value): ... # type: ignore[override] + def future_info(self, key, value=None): ... def global_unwatch(key): ... class _GlobalCacheUnwatchBatch(_GlobalCacheDeleteBatch): def make_call(self): ... - def future_info(self, key): ... + def future_info(self, key, value=None): ... global_compare_and_swap: Incomplete class _GlobalCacheCompareAndSwapBatch(_GlobalCacheSetBatch): def make_call(self): ... - def future_info(self, key, value): ... # type: ignore[override] + def future_info(self, key, value=None): ... def is_locked_value(value): ... def global_cache_key(key): ... diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi index 54233f0ab42e..f47cfde74f59 100644 --- a/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi +++ b/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi @@ -233,7 +233,9 @@ class TimeProperty(DateTimeProperty): ... class StructuredProperty(Property): def __init__(self, model_class: type, name: str | None = ..., **kwargs) -> None: ... def __getattr__(self, attrname: str): ... - def IN(self, value: Iterable[object]) -> query_module.DisjunctionNode | query_module.FalseNode: ... # type: ignore[override] + def IN( + self, value: Iterable[object], server_op: bool | None = None + ) -> query_module.DisjunctionNode | query_module.FalseNode: ... class LocalStructuredProperty(BlobProperty): def __init__(self, model_class: type[Model], **kwargs) -> None: ... From b6305bf8923371099f9ac895d30df9ee62768243 Mon Sep 17 00:00:00 2001 From: ekanshul <72524975+ekanshul@users.noreply.github.com> Date: Fri, 21 Aug 2026 00:35:06 +0530 Subject: [PATCH 2/2] Point upstream-repository at google-cloud-python --- stubs/google-cloud-ndb/METADATA.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/google-cloud-ndb/METADATA.toml b/stubs/google-cloud-ndb/METADATA.toml index 7f93ab49cd2b..a2dd4b4011d9 100644 --- a/stubs/google-cloud-ndb/METADATA.toml +++ b/stubs/google-cloud-ndb/METADATA.toml @@ -1,5 +1,5 @@ version = "2.5.*" -upstream-repository = "https://github.com/googleapis/python-ndb" +upstream-repository = "https://github.com/googleapis/google-cloud-python" partial-stub = true [tool.stubtest]