Various updates

.github/matrix.py

@@ -25,7 +25,7 @@ def main():
             }
         )
 
-    print(json.dumps(actions_matrix))
+    print(json.dumps(actions_matrix))  # noqa:T201
 
 
 if __name__ == "__main__":

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ concurrency:
 jobs:
   matrix:
     name: Build test matrix
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -15,20 +15,20 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Run tox
         id: matrix
         run: |
-          pip install $(grep "^tox==" requirements/local.txt)
+          pip install $(grep -E "^(tox|tox-uv)==" requirements/local.txt)
           echo "tox_matrix=$(tox -l | fgrep -v coverage | python .github/matrix.py)" >> $GITHUB_OUTPUT
     outputs:
       tox_matrix: ${{ steps.matrix.outputs.tox_matrix }}
 
   test:
     name: Test -- ${{ matrix.tox_env }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: matrix
     strategy:
       matrix:
@@ -47,5 +47,5 @@ jobs:
           cache-dependency-path: 'requirements/*.txt'
       - name: Run tests
         run: |
-          pip install $(grep "^tox==" requirements/local.txt)
+          pip install $(grep -E "^(tox|tox-uv)==" requirements/local.txt)
           tox -e ${{ matrix.tox_env }}

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2023, Developer Society Limited
+Copyright (c) 2019-2024, Developer Society Limited
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -32,17 +32,20 @@ check: ## Check for any obvious errors in the project's setup.
 check: pipdeptree-check
 
 format: ## Run this project's code formatters.
-format: black-format isort-format
+format: ruff-format
 
 lint: ## Lint the project.
-lint: black-lint isort-lint flake8-lint
+lint: ruff-lint
 
 test: ## Run unit and integration tests.
 test: django-test
 
 test-report: ## Run and report on unit and integration tests.
 test-report: coverage-clean test coverage-report
 
+test-lowest: ## Run tox with lowest (oldest) package dependencies.
+test-lowest: tox-test-lowest
+
 dist: ## Builds source and wheel package
 dist: clean build-dist
 
@@ -104,19 +107,6 @@ pip-install-local: venv-check
 	pip install -r requirements/local.txt
 
 
-# ISort
-isort-lint:
-	isort --check-only --diff cookiefilter tests
-
-isort-format:
-	isort cookiefilter tests
-
-
-# Flake8
-flake8-lint:
-	flake8 cookiefilter
-
-
 # Coverage
 coverage-report: coverage-combine coverage-html coverage-xml
 	coverage report --show-missing
@@ -136,23 +126,28 @@ coverage-clean:
 	rm -f .coverage
 
 
-# Black
-black-lint:
-	black --check cookiefilter tests setup.py
+# ruff
+ruff-lint:
+	ruff check
+	ruff format --check
 
-black-format:
-	black cookiefilter tests setup.py
+ruff-format:
+	ruff check --fix-only
+	ruff format
 
 
-#pipdeptree
+# pipdeptree
 pipdeptree-check:
-	@pipdeptree --warn fail > /dev/null
+	pipdeptree --warn fail >/dev/null
 
 
 # Project testing
 django-test:
 	PYTHONWARNINGS=all coverage run $$(which django-admin) test --pythonpath $$(pwd) --settings tests.settings tests
 
+tox-test-lowest:
+	tox --recreate --override testenv.uv_resolution=lowest
+
 
 # Help
 help-display:

cookiefilter/middleware.py

@@ -15,7 +15,7 @@ class CookieFilterMiddleware:
     Django project settings, or by extending this class.
     """
 
-    allowed_cookies = set(
+    allowed_cookies = frozenset(
         getattr(
             settings,
             "COOKIEFILTER_ALLOWED",
@@ -59,5 +59,4 @@ def __call__(self, request):
                 del request.META["HTTP_COOKIE"]
 
         # Now let remaining middleware or the view handle the request
-        response = self.get_response(request)
-        return response
+        return self.get_response(request)

pyproject.toml

@@ -1,15 +1,31 @@
-[tool.black]
+[tool.ruff]
 line-length = 99
-target-version = ['py37']
-exclude = '/migrations/'
+target-version = 'py38'
 
-[tool.isort]
-combine_as_imports = true
-sections = ['FUTURE','STDLIB','DJANGO','THIRDPARTY','FIRSTPARTY','LOCALFOLDER']
-known_django = 'django'
-include_trailing_comma = true
-float_to_top = true
-force_grid_wrap = 0
-line_length = 99
-multi_line_output = 3
-skip_glob = '*/migrations/*.py'
+[tool.ruff.lint]
+select = [
+    'F',   # pyflakes
+    'E',   # pycodestyle
+    'W',   # pycodestyle
+    'I',   # isort
+    'N',   # pep8-naming
+    'UP',  # pyupgrade
+    'S',   # flake8-bandit
+    'BLE', # flake8-blind-except
+    'C4',  # flake8-comprehensions
+    'EM',  # flake8-errmsg
+    'T20', # flake8-print
+    'RET', # flake8-return
+    'RUF', # ruff
+]
+ignore = [
+    'EM101', # flake8-errmsg: raw-string-in-exception
+]
+
+[tool.ruff.lint.isort]
+combine-as-imports = true
+
+[tool.ruff.lint.pep8-naming]
+extend-ignore-names = [
+    'assert*',
+]

requirements/local.txt

@@ -2,5 +2,6 @@
 
 bump2version==1.0.1
 Django>=4.2,<5.0
-tox==4.6.0
-twine==4.0.2
+tox==4.18.1
+tox-uv==1.11.3
+twine==5.1.1

requirements/testing.txt

@@ -1,5 +1,3 @@
-black==24.3.0 ; python_version >= '3.8'
-coverage==7.2.7
-flake8==6.0.0 ; python_version >= '3.8'
-isort==5.12.0 ; python_version >= '3.8'
-pipdeptree==2.9.0
+coverage==7.6.1
+pipdeptree==2.23.3
+ruff==0.6.5

setup.py

@@ -21,19 +21,19 @@ def read(filename):
     platforms=["any"],
     packages=find_packages(exclude=["tests"]),
     include_package_data=True,
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     install_requires=["Django>=2.2"],
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Framework :: Django",
         "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.2",

tests/settings.py

@@ -2,6 +2,6 @@
 
 USE_TZ = True
 
-SECRET_KEY = "cookiefilter"
+SECRET_KEY = "cookiefilter"  # noqa:S105
 
 INSTALLED_APPS = ["cookiefilter"]

tox.ini

@@ -2,9 +2,9 @@
 envlist =
     check
     lint
-    {py37,py38,py39}-django2.2
-    {py37,py38,py39,py310}-django3.2
-    {py38,py39,py310,py311}-django4.2
+    {py38,py39}-django2.2
+    {py38,py39,py310}-django3.2
+    {py38,py39,py310,py311,py312}-django4.2
     coverage
 no_package = true
 
@@ -16,19 +16,16 @@ deps =
     django4.2: Django>=4.2,<5.0
 allowlist_externals = make
 commands = make test
-usedevelop = true
+package = editable
 
 [testenv:check]
-basepython = python3.11
+basepython = python3.12
 commands = make check
-skip_install = true
 
 [testenv:lint]
-basepython = python3.11
+basepython = python3.12
 commands = make lint
-skip_install = true
 
 [testenv:coverage]
-basepython = python3.11
+basepython = python3.12
 commands = make coverage-report
-skip_install = true