More updates

.github/workflows/matchers/ruff.json

@@ -0,0 +1,14 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "ruff",
+      "pattern": [
+        {
+          "regexp": "^(Would reformat): (.+)$",
+          "message": 1,
+          "file": 2
+        }
+      ]
+    }
+  ]
+}

cookiecutter.json

@@ -1,7 +1,7 @@
 {
     "project_name": "Project Name",
     "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '').replace('-', '').replace('_', '') }}",
-    "django_version": ["5.0"],
+    "django_version": ["5.2"],
     "multilingual": "n",
     "geodjango": "n",
     "_copy_without_render": [

{{cookiecutter.project_slug}}/.github/workflows/ci_geodjango.yml

@@ -50,9 +50,11 @@ jobs:
           PGHOST: localhost
           PGUSER: postgres
           PGPASSWORD: password
-          TOX_OVERRIDE: "testenv.pass_env=PG*"
+          RUFF_OUTPUT_FORMAT: github
+          TOX_OVERRIDE: "testenv.pass_env=PG*,RUFF_OUTPUT_FORMAT"
         run: |
           pip install $(grep -E "^(tox|tox-uv)==" requirements/local.txt)
+          echo "::add-matcher::.github/workflows/matchers/ruff.json"
           tox
     services:
       postgres:

{{cookiecutter.project_slug}}/.github/workflows/ci_standard.yml

@@ -45,9 +45,11 @@ jobs:
           PGHOST: localhost
           PGUSER: postgres
           PGPASSWORD: password
-          TOX_OVERRIDE: "testenv.pass_env=PG*"
+          RUFF_OUTPUT_FORMAT: github
+          TOX_OVERRIDE: "testenv.pass_env=PG*,RUFF_OUTPUT_FORMAT"
         run: |
           pip install $(grep -E "^(tox|tox-uv)==" requirements/local.txt)
+          echo "::add-matcher::.github/workflows/matchers/ruff.json"
           tox
     services:
       postgres:

{{cookiecutter.project_slug}}/Makefile

@@ -51,10 +51,10 @@ check: ## Check for any obvious errors in the project's setup.
 check: pipdeptree-check npm-check django-check
 
 format: ## Run this project's code formatters.
-format: ruff-format black-format isort-format prettier-format stylelint-format djlint-format
+format: ruff-format prettier-format stylelint-format djlint-format
 
 lint: ## Lint the project.
-lint: ruff-lint black-lint isort-lint flake8-lint npm-install eslint-lint prettier-lint stylelint-lint djlint-lint djlint-check
+lint: ruff-lint eslint-lint prettier-lint stylelint-lint djlint-lint djlint-check
 
 test: ## Run unit and integration tests.
 test: django-test
@@ -68,8 +68,6 @@ test-report: coverage-clean test coverage-report
 deploy: ## Deploy this project to demo or live.
 deploy: fab-deploy
 
-
-
 # ---------------
 # Utility targets
 # ---------------
@@ -119,28 +117,6 @@ fab-deploy:
 	fab deploy
 
 
-# Ruff
-ruff-lint:
-	ruff check .
-	ruff format --check apps project
-
-ruff-format:
-	ruff check --fix-only .
-
-
-# ISort
-isort-lint:
-	isort --check-only --diff apps project
-
-isort-format:
-	isort apps project
-
-
-# Flake8
-flake8-lint:
-	flake8 apps project
-
-
 # Coverage
 coverage-report: coverage-html coverage-xml
 	coverage report --show-missing
@@ -225,12 +201,14 @@ stylelint-format:
 	npm run stylelint --silent -- static/src/scss --fix
 
 
-# Black
-black-lint:
-	black --check apps project
+# Ruff
+ruff-lint:
+	ruff check
+	ruff format --check
 
-black-format:
-	black apps project
+ruff-format:
+	ruff check --fix-only
+	ruff format
 
 
 # DJ lint

{{cookiecutter.project_slug}}/apps/accounts/tests/factories.py

@@ -7,8 +7,8 @@ class UserFactory(factory.django.DjangoModelFactory):
     username = factory.Sequence(lambda n: f"user{n}")
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")
-    email = factory.Sequence(lambda n: "person{0}@example.org".format(n))
-    password = "test123"
+    email = factory.Sequence(lambda n: f"person{n}@example.org")
+    password = "test123"  # noqa:S105
 
     class Meta:
         model = User

{{cookiecutter.project_slug}}/apps/core/context_processors.py

@@ -7,7 +7,7 @@
 BROWSERSYNC_URL = "http://{host}:{port}/browser-sync/browser-sync-client.js?t={time}"
 
 
-@functools.lru_cache()
+@functools.cache
 def browsersync_url(host):
     """
     Return the browsersync javascript URL for a given hostname, or None if disabled.

{{cookiecutter.project_slug}}/apps/core/management/commands/runserver.py

@@ -61,17 +61,17 @@ def start_webpack(self, **options):
             webpack_args.append("--display=errors-only")
 
         if webpack_args:
-            webpack_args = ["--"] + webpack_args
+            webpack_args = ["--", *webpack_args]
 
         self.stdout.write(">>> Starting webpack")
-        self.webpack_process = subprocess.Popen(
-            ["npm", "start"] + webpack_args,
+        self.webpack_process = subprocess.Popen(  # noqa:S603
+            ["npm", "start", *webpack_args],  # noqa:S607
             shell=False,
             stdin=subprocess.PIPE,
             stdout=self.stdout._out,
             stderr=self.stderr._out,
         )
-        self.stdout.write(">>> Webpack process on pid {}".format(self.webpack_process.pid))
+        self.stdout.write(f">>> Webpack process on pid {self.webpack_process.pid}")
 
         def kill_webpack_process():
             self.stdout.write(">>> Closing webpack process")