Pre-commit configuration fixes

matthiask · matthiask · commit 2be30fe5796a · 2026-06-02T08:25:18.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,33 +1,40 @@
-exclude: ".yarn/|yarn.lock|\\.min\\.(css|js)$"
+exclude: "django_prose_editor/static/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
       - id: check-added-large-files
+      - id: check-builtin-literals
+      - id: check-executables-have-shebangs
       - id: check-merge-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: detect-private-key
       - id: end-of-file-fixer
+      - id: mixed-line-ending
       - id: trailing-whitespace
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.2
-    hooks:
-      - id: pyupgrade
-        args: [--py310-plus]
   - repo: https://github.com/adamchainz/django-upgrade
     rev: 1.30.0
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
-  - repo: https://github.com/pycqa/isort
-    rev: 9.0.0a3
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.13
+    hooks:
+      - id: ruff-check
+        args: [--unsafe-fixes]
+      - id: ruff-format
+  - repo: https://github.com/biomejs/pre-commit
+    rev: v2.4.15
     hooks:
-      - id: isort
-        args: [--profile=black, --lines-after-imports=2, --combine-as]
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.5.0
+      - id: biome-check
+        args: [--unsafe]
+        verbose: true
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.21.2
     hooks:
-      - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: 7.3.0
+      - id: pyproject-fmt
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.25
     hooks:
-      - id: flake8
-        args: ["--ignore=E203,E501,W503"]
+      - id: validate-pyproject
diff --git a/feincms_oembed/contents.py b/feincms_oembed/contents.py
@@ -79,7 +79,7 @@ class FeedContent(models.Model):
     url = models.URLField(
         _("Feed URL"),
         help_text=_(
-            "Insert any RSS URL," " e.g. https://www.djangoproject.com/rss/weblog/"
+            "Insert any RSS URL, e.g. https://www.djangoproject.com/rss/weblog/"
         ),
     )
 
diff --git a/feincms_oembed/migrations/0001_initial.py b/feincms_oembed/migrations/0001_initial.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = []
 
     operations = [
diff --git a/feincms_oembed/models.py b/feincms_oembed/models.py
@@ -9,6 +9,7 @@
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
+
 DEFAULT_MAX_AGE = 7 * 24 * 60 * 60  # Cache lookups for a week
 
 
diff --git a/setup.py b/setup.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
 from setuptools import setup
 
+
 setup()
diff --git a/tests/manage.py b/tests/manage.py
@@ -2,6 +2,7 @@
 import os
 import sys
 
+
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 if __name__ == "__main__":
diff --git a/tests/testapp/migrate/page/0001_initial.py b/tests/testapp/migrate/page/0001_initial.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
diff --git a/tests/testapp/models.py b/tests/testapp/models.py
@@ -2,6 +2,7 @@
 
 from feincms_oembed.contents import OembedContent
 
+
 Page.register_templates(
     {
         "key": "base",
diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py
@@ -1,5 +1,6 @@
 import os
 
+
 INSTALLED_APPS = (
     "django.contrib.auth",
     "django.contrib.contenttypes",
diff --git a/tests/testapp/test_admin.py b/tests/testapp/test_admin.py
@@ -4,6 +4,7 @@
 
 from feincms_oembed.models import CachedLookup
 
+
 ASTLEY = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
 
 
diff --git a/tests/testapp/urls.py b/tests/testapp/urls.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
 from django.urls import include, path
 
+
 urlpatterns = [path("admin/", admin.site.urls), path("", include("feincms.urls"))]
diff --git a/tox.ini b/tox.ini
@@ -11,5 +11,5 @@ commands =
     coverage report -m
 deps =
     dj42: Django>=4.2,<5.0
-    dj52: Django>=5.2a1,<6.0
+    dj52: Django>=5.2,<6.0
     djmain: https://github.com/django/django/archive/main.tar.gz

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class FeedContent(models.Model):`
`79`	`79`	`url = models.URLField(`
`80`	`80`	`_("Feed URL"),`
`81`	`81`	`help_text=_(`
`82`		`- "Insert any RSS URL," " e.g. https://www.djangoproject.com/rss/weblog/"`
	`82`	`+ "Insert any RSS URL, e.g. https://www.djangoproject.com/rss/weblog/"`
`83`	`83`	`),`
`84`	`84`	`)`
`85`	`85`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 #!/usr/bin/env python3
 from setuptools import setup
++
 setup()
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`from feincms_oembed.contents import OembedContent`
`4`	`4`
	`5`	`+`
`5`	`6`	`Page.register_templates(`
`6`	`7`	`{`
`7`	`8`	`"key": "base",`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`from feincms_oembed.models import CachedLookup`
`6`	`6`
	`7`	`+`
`7`	`8`	`ASTLEY = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"`
`8`	`9`
`9`	`10`