From 88dcdb129bd631f7437e94552ef95d4b0aaddd84 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Thu, 2 Apr 2026 11:05:41 -0400
Subject: [PATCH 1/3] fix: allow redis 7.x

---
 packages/google-cloud-ndb/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google-cloud-ndb/setup.py b/packages/google-cloud-ndb/setup.py
index 4e3b42654020..3221db027b85 100644
--- a/packages/google-cloud-ndb/setup.py
+++ b/packages/google-cloud-ndb/setup.py
@@ -45,7 +45,7 @@ def main():
         "protobuf >= 4.25.8, < 8.0.0",
         "pymemcache >= 2.1.0, < 5.0.0",
         "pytz >= 2018.3",
-        "redis >= 3.0.0, < 7.0.0",
+        "redis >= 3.0.0, < 8.0.0",
     ]
 
     setuptools.setup(

From cd7101dac05ca2010c77888230bc7f96806fb967 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Thu, 2 Apr 2026 11:07:19 -0400
Subject: [PATCH 2/3] ensure tests run with redis 7.x

---
 packages/google-cloud-ndb/testing/constraints-3.14.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/google-cloud-ndb/testing/constraints-3.14.txt b/packages/google-cloud-ndb/testing/constraints-3.14.txt
index e69de29bb2d1..0d0adf684566 100644
--- a/packages/google-cloud-ndb/testing/constraints-3.14.txt
+++ b/packages/google-cloud-ndb/testing/constraints-3.14.txt
@@ -0,0 +1,8 @@
+# We use the constraints file for the latest Python version
+# (currently this file) to check that the latest
+# major versions of dependencies are supported in setup.py.
+# List all library dependencies and extras in this file.
+# Require the latest major version be installed for each dependency.
+# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
+# Then this file should have google-cloud-foo>=1
+redis>=7

From 1862d3a7ba6170cb80a8efc06f5278b8159ed100 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Thu, 2 Apr 2026 11:10:24 -0400
Subject: [PATCH 3/3] always run system tests for google-cloud-ndb

---
 .kokoro/system.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.kokoro/system.sh b/.kokoro/system.sh
index 07b6e0d5a64f..8d445e45fcf0 100755
--- a/.kokoro/system.sh
+++ b/.kokoro/system.sh
@@ -98,6 +98,7 @@ packages_with_system_tests=(
   "sqlalchemy-spanner"
   "google-cloud-firestore"
   "google-cloud-logging"
+  "google-cloud-ndb"
   "google-cloud-pubsub"
   "google-cloud-testutils"
   "sqlalchemy-bigquery"