Merge branch 'main' into free-threaded-python3.14t

Author: cclauss

.github/workflows/ci.yml

@@ -21,8 +21,8 @@ jobs:
           mkdir -p ./custom-cache/
           docker compose --profile all build
           docker pull valkey/valkey:latest
-          docker pull bitnami/valkey-cluster:8.1
-          docker save bitnami/valkey-cluster valkey/valkey:latest -o ./custom-cache/all.tar
+          docker pull bitnamilegacy/valkey-cluster:8.1
+          docker save bitnamilegacy/valkey-cluster valkey/valkey:latest -o ./custom-cache/all.tar
 
   test:
     runs-on: ubuntu-latest

CHANGES.md

@@ -1,3 +1,8 @@
+Version 0.3.2
+-------------
+
+- add `decr_version` method to be compatible with django's `BaseCache`
+
 Version 0.3.1
 -------------
 

compose.yaml

@@ -22,7 +22,7 @@ services:
       retries: 5
 
   valkey-node-0:
-    image: bitnami/valkey-cluster:8.1
+    image: bitnamilegacy/valkey-cluster:8.1
     environment:
       - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
       - "ALLOW_EMPTY_PASSWORD=yes"
@@ -35,7 +35,7 @@ services:
       - all
 
   valkey-node-1:
-    image: bitnami/valkey-cluster:8.1
+    image: bitnamilegacy/valkey-cluster:8.1
     environment:
       - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
       - "ALLOW_EMPTY_PASSWORD=yes"
@@ -49,7 +49,7 @@ services:
       - all
 
   valkey-node-2:
-    image: bitnami/valkey-cluster:8.1
+    image: bitnamilegacy/valkey-cluster:8.1
     environment:
       - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
       - "ALLOW_EMPTY_PASSWORD=yes"
@@ -62,7 +62,7 @@ services:
       - all
 
   valkey-node-3:
-    image: bitnami/valkey-cluster:8.1
+    image: bitnamilegacy/valkey-cluster:8.1
     environment:
       - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
       - "ALLOW_EMPTY_PASSWORD=yes"
@@ -77,7 +77,7 @@ services:
       - all
 
   valkey-node-4:
-    image: bitnami/valkey-cluster:8.1
+    image: bitnamilegacy/valkey-cluster:8.1
     environment:
       - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
       - "ALLOW_EMPTY_PASSWORD=yes"
@@ -90,7 +90,7 @@ services:
       - all
 
   valkey-node-5:
-    image: bitnami/valkey-cluster:8.1
+    image: bitnamilegacy/valkey-cluster:8.1
     environment:
       - "VALKEY_CLUSTER_REPLICAS=1"
       - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"

django_valkey/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (0, 3, 1)
+VERSION = (0, 3, 2)
 __version__ = ".".join(map(str, VERSION))
 
 

django_valkey/base.py

@@ -210,6 +210,9 @@ def set(self: BaseValkeyCache, *args, **kwargs) -> bool:
     def incr_version(self: BaseValkeyCache, *args, **kwargs) -> int:
         return self.client.incr_version(*args, **kwargs)
 
+    def decr_version(self: BaseValkeyCache, *args, **kwargs) -> int:
+        return self.client.decr_version(*args, **kwargs)
+
     def add(self: BaseValkeyCache, *args, **kwargs) -> bool:
         return self.client.add(*args, **kwargs)
 
@@ -398,6 +401,9 @@ async def set(self: BaseValkeyCache, *args, **kwargs):
     async def incr_version(self, *args, **kwargs):
         return await self.client.aincr_version(*args, **kwargs)
 
+    async def decr_version(self, *args, **kwargs):
+        return await self.client.adecr_version(*args, **kwargs)
+
     async def add(self, *args, **kwargs):
         return await self.client.aadd(*args, **kwargs)
 

django_valkey/base_client.py

@@ -331,6 +331,15 @@ def incr_version(
         self.delete(old_key, client=client)
         return version + delta
 
+    def decr_version(
+        self: BaseClient,
+        key: KeyT,
+        delta: int = 1,
+        version: int | None = None,
+        client: Backend | Any | None = None,
+    ) -> int:
+        return self.incr_version(key=key, delta=-delta, version=version, client=client)
+
     def _incr_version(
         self: BaseClient,
         key: KeyT,
@@ -1464,6 +1473,17 @@ async def incr_version(
         await self.delete(old_key, client=client)
         return version + delta
 
+    async def decr_version(
+        self: BaseClient,
+        key: KeyT,
+        delta: int = 1,
+        version: int | None = None,
+        client: Backend | Any | None = None,
+    ) -> int:
+        return await self.incr_version(
+            key=key, delta=-delta, version=version, client=client
+        )
+
     async def _incr_version(self, key, delta, version, client) -> tuple:
         if version is None:
             version = self._backend.version

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-valkey"
-version = "0.3.1"
+version = "0.3.2"
 description = "a valkey backend for django"
 readme = "README.rst"
 requires-python = ">=3.10"

tests/test_backend.py

@@ -536,6 +536,28 @@ def test_ttl_incr_version_no_timeout(self, cache: ValkeyCache):
 
         assert my_value == "hello world!"
 
+    def test_decr_version(self, cache: ValkeyCache):
+        cache.set("keytest", 2, version=3)
+        res = cache.get("keytest", version=3)
+        assert res == 2
+
+        cache.decr_version("keytest", version=3)
+
+        res = cache.get("keytest", version=3)
+        assert res is None
+
+        res = cache.get("keytest", version=2)
+        assert res == 2
+
+    def test_ttl_decr_version_no_timeout(self, cache: ValkeyCache):
+        cache.set("my_key", "hello world!", version=3, timeout=None)
+
+        cache.decr_version("my_key", version=3)
+
+        my_value = cache.get("my_key", version=2)
+
+        assert my_value == "hello world!"
+
     def test_delete_pattern(self, cache: ValkeyCache):
         if isinstance(cache.client, DefaultClusterClient):
             pytest.skip("cluster client has a specific test")

tests/test_cache_options.py

@@ -36,6 +36,7 @@ def reverse_key(key: str) -> str:
     "hlen",
     "incr",
     "incr_version",
+    "decr_version",
     "keys",
     "lock",
     "mget",

tests/tests_async/test_backend.py

@@ -516,6 +516,28 @@ async def test_ttl_incr_version_no_timeout(self, cache: AsyncValkeyCache):
 
         assert my_value == "hello world!"
 
+    async def test_decr_version(self, cache: AsyncValkeyCache):
+        await cache.aset("keytest", 2, version=3)
+        res = await cache.aget("keytest", version=3)
+        assert res == 2
+
+        await cache.decr_version("keytest", version=3)
+
+        res = await cache.aget("keytest", version=3)
+        assert res is None
+
+        res = await cache.aget("keytest", version=2)
+        assert res == 2
+
+    async def test_ttl_decr_version_no_timeout(self, cache: AsyncValkeyCache):
+        await cache.set("my_key", "hello world!", timeout=None, version=3)
+
+        await cache.adecr_version("my_key", version=3)
+
+        my_value = await cache.get("my_key", version=2)
+
+        assert my_value == "hello world!"
+
     async def test_delete_pattern(self, cache: AsyncValkeyCache):
         for key in ["foo-aa", "foo-ab", "foo-bb", "foo-bc"]:
             await cache.aset(key, "foo")