Port to new versions of Django

Author: sergeybe2

.pre-commit-config.yaml

@@ -0,0 +1,23 @@
+default_language_version:
+  python: python3.13
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-merge-conflict
+      - id: check-json
+      - id: check-yaml
+      - id: check-toml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: no-commit-to-branch
+      - id: trailing-whitespace
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.2
+    hooks:
+      - id: ruff
+        types_or: [ python, pyi ]

MANIFEST.in

@@ -1 +1 @@
-include LICENSE AUTHORS.rst README.rst
+include LICENSE AUTHORS.rst README.rst

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 PACKAGE_NAME=redis_cache
-DJANGO_VERSION?=>=1.11,<4.0
+DJANGO_VERSION?=>=1.11,<6.0
 
 .PHONY: install_requirements
 install_requirements: requirements*.txt
@@ -21,7 +21,7 @@ clean:
 
 .PHONY: test
 test: install_requirements
-	PYTHONPATH=$(PYTHONPATH): django-admin test --settings=tests.settings -s
+	PYTHONPATH=$(PYTHONPATH): django-admin test --settings=tests.settings
 
 .PHONY: shell
 shell:

docs/conf.py

@@ -13,10 +13,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
-import shlex
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

docs/index.rst

@@ -23,4 +23,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

install_redis.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-: ${REDIS_VERSION:="4.0.11"}
+: ${REDIS_VERSION:="7.4.2"}
 
-test -d redis || git clone https://github.com/antirez/redis
+test -d redis || git clone https://github.com/redis/redis
 git -C redis checkout $REDIS_VERSION
 make -C redis

redis_cache/__init__.py

@@ -1,3 +1,9 @@
 from redis_cache.backends.single import RedisCache
 from redis_cache.backends.multiple import ShardedRedisCache
 from redis_cache.backends.dummy import RedisDummyCache
+
+__all__ = [
+    RedisCache,
+    ShardedRedisCache,
+    RedisDummyCache,
+]

redis_cache/backends/base.py

@@ -40,7 +40,7 @@ def __init__(self, server, params):
         """
         Connect to Redis, and set up cache backend.
         """
-        super(BaseRedisCache, self).__init__(params)
+        super().__init__(params)
         self.server = server
         self.servers = get_servers(server)
         self.params = params or {}

redis_cache/backends/multiple.py

@@ -9,7 +9,7 @@
 class ShardedRedisCache(BaseRedisCache):
 
     def __init__(self, server, params):
-        super(ShardedRedisCache, self).__init__(server, params)
+        super().__init__(server, params)
         self.sharder = HashRing()
 
         for server in self.servers:

redis_cache/backends/single.py

@@ -1,7 +1,8 @@
 try:
     import cPickle as pickle
 except ImportError:
-    import pickle
+    import pickle  # noqa
+
 import random
 
 from django.core.cache.backends.base import DEFAULT_TIMEOUT
@@ -15,7 +16,7 @@ def __init__(self, server, params):
         """
         Connect to Redis, and set up cache backend.
         """
-        super(RedisCache, self).__init__(server, params)
+        super().__init__(server, params)
 
         for server in self.servers:
             client = self.create_client(server)