Added blocking parameter to lock

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -15,49 +15,46 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.6'
-          - '3.7'
-          - '3.8'
-          - '3.9'
           - '3.10'
+          - '3.11'
         django-version:
-          - '2.2'
-          - '3.1'
-          - '3.2'
-          - '4.0'
+          - '4.2'
+          - '5.0'
         redis-version:
           - 'latest'
 
-        # only test pre-release dependencies for the latest Python
+        # Only test pre-release dependencies for the latest Python.
         include:
+          # Django 4.2 and python 3.8 with latest redis
+          - django-version: '4.2'
+            redis-version: 'latest'
+            python-version: '3.8'
+
+          # Django 4.2 and python 3.9 with latest redis
+          - django-version: '4.2'
+            redis-version: 'latest'
+            python-version: '3.9'
+
           # latest Django with pre-release redis
-          - django-version: '4.0'
+          - django-version: '5.0'
             redis-version: 'master'
-            python-version: '3.10'
+            python-version: '3.11'
 
           # latest redis with pre-release Django
           - django-version: 'main'
             redis-version: 'latest'
-            python-version: '3.10'
+            python-version: '3.11'
 
           # pre-release Django and redis
           - django-version: 'main'
             redis-version: 'master'
-            python-version: '3.10'
-
-        # exclude python 3.6 and 3.7 for django 4.x as they are not supported see https://docs.djangoproject.com/en/dev/releases/4.0/#python-compatibility
-        exclude:
-          - django-version: '4.0'
-            python-version: '3.6'
-
-          - django-version: '4.0'
-            python-version: '3.7'
+            python-version: '3.11'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -67,7 +64,7 @@ jobs:
           echo "::set-output name=dir::$(pip cache dir)"
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: pip-test-python-${{ matrix.python-version }}-django-${{ matrix.django-version }}-redis-${{ matrix.redis-version }}-${{ hashFiles('**/setup.*') }}
@@ -96,7 +93,7 @@ jobs:
           REDIS: ${{ matrix.redis-version }}
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
         with:
           env_vars: DJANGO,REDIS,PYTHON
           flags: tests
@@ -114,15 +111,14 @@ jobs:
       matrix:
         tool:
           - 'black'
-          - 'flake8'
-          - 'isort'
+          - 'ruff'
           - 'mypy'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -132,7 +128,7 @@ jobs:
           echo "::set-output name=dir::$(pip cache dir)"
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: pip-lint-${{ hashFiles('**/setup.*') }}
@@ -142,14 +138,14 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --upgrade tox
+          python -m pip install --upgrade "tox<4"
 
       - name: Run ${{ matrix.tool }}
         run: tox -e ${{ matrix.tool }}
 
       - name: Upload coverage
         if: ${{ matrix.tool == 'mypy' }}
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
         with:
           flags: mypy
 
@@ -158,12 +154,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -173,7 +169,7 @@ jobs:
           echo "::set-output name=dir::$(pip cache dir)"
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: pip-check-changelog-${{ hashFiles('**/setup.*') }}

.github/workflows/release.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.2.0
+  rev: v4.6.0
   hooks:
   - id: check-ast
   - id: check-case-conflict
@@ -9,22 +9,15 @@ repos:
   - id: check-symlinks
   - id: debug-statements
 
-- repo: https://github.com/asottile/pyupgrade
-  rev: v2.32.0
+# from readme - ruff with autofix must run before
+# other formatters, such as black
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.4.8
   hooks:
-  - id: pyupgrade
+  - id: ruff
+    args: [ --fix, --exit-non-zero-on-fix , --show-fixes]
 
 - repo: https://github.com/psf/black
-  rev: 22.3.0
+  rev: 24.4.2
   hooks:
   - id: black
-
-- repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
-  hooks:
-  - id: flake8
-
-- repo: https://github.com/PyCQA/isort
-  rev: 5.10.1
-  hooks:
-  - id: isort

.ruff.toml

@@ -0,0 +1,137 @@
+# https://beta.ruff.rs/docs/rules/
+lint.select = [
+  # rules from pyflakes
+  "F",
+
+  # rules from pycodestyle
+  "E", "W",
+
+  # rules from mccabe
+  "C90",
+
+  # rules from isort
+  "I",
+
+  # rules from pyupgrade
+  "UP",
+
+  # rules from flake8-2020
+  "YTT",
+
+  # rules from flake8-annotations
+#  "ANN",
+
+  # rules from flake8-bandit
+  "S",
+
+  # rules from flake8-blind-except
+  "BLE",
+
+  # rules from flake8-boolean-trap
+  # TODO: "FBT",
+
+  # rules from flake8-bugbear
+  "B",
+
+  # rules from flake8-builtins
+  "A",
+
+  # rules from flake8-commas
+  "COM",
+
+  # rules from flake8-comprehensions
+  "C4",
+
+  # rules from flake8-datetimez
+  # TODO: "DTZ",
+
+  # rules from flake8-debugger
+  "T10",
+
+  # rules from flake8-django
+  "DJ",
+
+  # rules from flake8-errmsg
+  "EM",
+
+  # rules from flake8-executable
+  "EXE",
+
+  # rules from flake8-implicit-str-concat
+  "ISC",
+
+  # rules from flake8-import-conventions
+  "ICN",
+
+  # rules from flake8-logging-format
+  "G",
+
+  # rules from flake8-no-pep420
+  "INP",
+
+  # rules from flake8-pie
+  # TODO: "PIE",
+
+  # rules from flake8-print
+  "T20",
+
+  # rules from flake8-pyi
+  "PYI",
+
+  # rules from flake8-pytest-style
+  # TODO: "PT",
+
+  # rules from flake8-raise
+  "RSE",
+
+  # rules from flake8-return
+  "RET",
+
+  # rules from flake8-self
+  # TODO: "SLF",
+
+  # rules from flake8-simplify
+  "SIM",
+
+  # rules from flake8-tidy-imports
+  "TID",
+
+  # rules from flake8-type-checking
+  "TCH",
+
+  # rules from flake8-gettext
+  "INT",
+
+  # rules from flake8-unused-arguments
+  # TODO: "ARG",
+
+  # rules from flake8-use-pathlib
+  "PTH",
+
+  # removes unused noqa comments
+  "RUF100",
+]
+
+lint.ignore = [
+  "COM812", # missing trailing comma, covered by black
+  "ANN101", # ignore missing type annotation in self parameter
+  "S311", # ignore Standard pseudo-random generators because they are not used for cryptographic purposes
+]
+
+fix = true
+
+target-version = "py38"
+
+[lint.flake8-tidy-imports]
+## Disallow all relative imports.
+ban-relative-imports = "all"
+
+[lint.per-file-ignores]
+# ignore assert statements in tests
+"tests/*.py" = ["S101"]
+
+# ignore SECRET_KEY in settings files in tests
+"tests/settings/*.py" = ["S105"]
+
+# pickle is used on purpose and its use is discouraged
+"django_redis/serializers/pickle.py" = ["S301"]

AUTHORS.rst

@@ -1,10 +1,10 @@
 Andrei Antoukh / niwibe <https://github.com/niwibe>
-Sean Bleier <http://github.com/sebleier>
-Matt Dennewitz <http://github.com/blackbrrr>
-Jannis Leidel <http://github.com/jezdez>
-S. Angel / Twidi <http://github.com/twidi>
-Noah Kantrowitz / coderanger <http://github.com/coderanger>
-Martin Mahner / bartTC <http://github.com/bartTC>
+Sean Bleier <https://github.com/sebleier>
+Matt Dennewitz <https://github.com/blackbrrr>
+Jannis Leidel <https://github.com/jezdez>
+S. Angel / Twidi <https://github.com/twidi>
+Noah Kantrowitz / coderanger <https://github.com/coderanger>
+Martin Mahner / bartTC <https://github.com/bartTC>
 Timothée Peignier / cyberdelia <https://github.com/cyberdelia>
 Lior Sion / liorsion <https://github.com/liorsion>
 Ales Zoulek / aleszoulek <https://github.com/aleszoulek>
@@ -14,3 +14,4 @@ David Zderic / dzderic <https://github.com/dzderic>
 Kirill Zaitsev / teferi <https://github.com/teferi>
 Jon Dufresne <https://github.com/jdufresne>
 Anès Foufa <https://github.com/AnesFoufa>
+Segyo Myung <https://github.com/myungsegyo>