Improve pre-commit configuration hooks (#1645)

pauloxnet · web-flow · commit b1fdc9a00b45 · 2024-10-24T09:41:52.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,38 +1,50 @@
-exclude: '(\/migrations\/|^djangoproject\/static\/.*$)'
+exclude: '(^djangoproject\/static\/.*$)'
 default_language_version:
     python: python3
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: "v4.6.0"
+      rev: "v5.0.0"
       hooks:
+          - id: check-added-large-files
+            args: ["--maxkb=1024"]
+          - id: check-case-conflict
+          - id: check-docstring-first
+          - id: check-executables-have-shebangs
+          - id: check-json
+          - id: check-merge-conflict
+          - id: check-shebang-scripts-are-executable
+          - id: check-toml
+          - id: check-yaml
+            args: ["--allow-multiple-documents"]
           - id: debug-statements
           - id: detect-private-key
           - id: end-of-file-fixer
             exclude_types: [json, sql]
           - id: file-contents-sorter
             files: ^(requirements/\w*.txt)$
             args: ["--ignore-case", "--unique"]
-          - id: fix-encoding-pragma
-            args: ["--remove"]
+          - id: fix-byte-order-marker
+          - id: mixed-line-ending
           - id: trailing-whitespace
     - repo: https://github.com/asottile/pyupgrade
-      rev: "v3.17.0"
+      rev: "v3.19.0"
       hooks:
           - id: pyupgrade
             # TODO: Update to --py312 when dropping support for
             # Python 3.8
             args: [--py38-plus]
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: "1.21.0"
+      rev: "1.22.1"
       hooks:
           - id: django-upgrade
             args: [--target-version, "4.2"]
     - repo: https://github.com/psf/black
-      rev: 24.8.0
+      rev: 24.10.0
       hooks:
           - id: black
-    - repo: https://github.com/pre-commit/mirrors-prettier
-      rev: "v4.0.0-alpha.8"
+            exclude: '(\/migrations\/)'
+    - repo: https://github.com/rbubley/mirrors-prettier
+      rev: "v3.3.3"
       hooks:
           - id: prettier
             exclude_types: [html, json, scss]
@@ -45,7 +57,15 @@ repos:
       hooks:
           - id: flake8
     - repo: https://github.com/rtts/djhtml
-      rev: "3.0.6"
+      rev: "3.0.7"
       hooks:
           - id: djhtml
             files: .*/templates/.*\.html$
+    - repo: https://github.com/tox-dev/pyproject-fmt
+      rev: "2.4.3"
+      hooks:
+          - id: pyproject-fmt
+    - repo: https://github.com/mrtazz/checkmake.git
+      rev: 0.2.2
+      hooks:
+          - id: checkmake
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ SCSS = djangoproject/scss
 JQUERY_FLOT=djangoproject/static/js/lib/jquery-flot
 APP_LIST ?= accounts aggregator blog contact dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
 
-.PHONY: collectstatics compile-scss compile-scss-debug watch-scss run install test ci
+.PHONY: all ci clean collectstatics compile-scss compile-scss-debug install run test watch-scss
 
 collectstatics: compile-scss
 	python -m manage collectstatic --noinput
@@ -28,7 +28,7 @@ migrations-check:
 	python -m manage makemigrations --check --dry-run
 
 test: migrations-check
-	@python -m coverage run --source=. manage.py test -v2 $(APP_LIST)
+	@python -m coverage run --source=. -m manage test -v2 $(APP_LIST)
 
 ci: test
 	@python -m coverage report
diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 
diff --git a/aggregator/migrations/0001_initial.py b/aggregator/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 
diff --git a/aggregator/migrations/0002_add_feed_approver_auth_group.py b/aggregator/migrations/0002_add_feed_approver_auth_group.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations
 
diff --git a/blog/migrations/0001_initial.py b/blog/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/blog/migrations/0002_event.py b/blog/migrations/0002_event.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/dashboard/migrations/0001_initial.py b/dashboard/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 
 import django.db.models.deletion
diff --git a/djangoproject/scss/_utils.scss b/djangoproject/scss/_utils.scss
diff --git a/djangoproject/scss/output.scss b/djangoproject/scss/output.scss
diff --git a/docs/migrations/0001_squashed_0005_remove_version.py b/docs/migrations/0001_squashed_0005_remove_version.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-21 07:14
-from __future__ import unicode_literals
 
 import django.db.models.deletion
 from django.conf import settings
@@ -64,7 +62,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name="documentrelease",
-            unique_together=set([("lang", "release")]),
+            unique_together={("lang", "release")},
         ),
         migrations.AddField(
             model_name="document",
@@ -77,6 +75,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name="document",
-            unique_together=set([("release", "path")]),
+            unique_together={("release", "path")},
         ),
     ]
diff --git a/docs/migrations/0002_extend_lang_field.py b/docs/migrations/0002_extend_lang_field.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-05 09:27
-from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models
diff --git a/docs/migrations/0003_auto_20171107_1513.py b/docs/migrations/0003_auto_20171107_1513.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.7 on 2017-11-07 15:13
-from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
 import django.contrib.postgres.indexes
diff --git a/docs/migrations/0004_add_release_title_idx.py b/docs/migrations/0004_add_release_title_idx.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-01-09 12:50
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
diff --git a/fundraising/migrations/0001_squashed_0007_inkinddonor.py b/fundraising/migrations/0001_squashed_0007_inkinddonor.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-20 17:50
-from __future__ import unicode_literals
 
 import django.db.models.deletion
 import django.utils.timezone
diff --git a/fundraising/test_data/empty_payment.json b/fundraising/test_data/empty_payment.json
@@ -7,7 +7,6 @@
     "object": ""
   },
   "livemode": true,
-  "object": "event",
   "pending_webhooks": 1,
   "request": null,
   "type": "invoice.payment_succeeded"
diff --git a/members/migrations/0001_squashed_0004_corporatemember_notes.py b/members/migrations/0001_squashed_0004_corporatemember_notes.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-20 18:18
-from __future__ import unicode_literals
 
 import django.db.models.deletion
 import django.views.generic.dates
diff --git a/members/migrations/0002_corporatemember_django_usage.py b/members/migrations/0002_corporatemember_django_usage.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-02 10:28
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
diff --git a/members/migrations/0003_corporatemember_django_usage_verbose_name.py b/members/migrations/0003_corporatemember_django_usage_verbose_name.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.dev20161105150738 on 2016-11-08 03:45
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
diff --git a/members/migrations/0004_individual_members.py b/members/migrations/0004_individual_members.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.dev20161105150738 on 2016-11-08 03:25
-from __future__ import unicode_literals
 
 from django.db import migrations
 
diff --git a/members/migrations/0005_corporatemember_inactive.py b/members/migrations/0005_corporatemember_inactive.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-01-28 09:37
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
diff --git a/members/migrations/0006_team.py b/members/migrations/0006_team.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-02-13 09:11
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
diff --git a/members/migrations/0007_auto_20170216_0837.py b/members/migrations/0007_auto_20170216_0837.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-02-16 08:37
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[tool.black]
+extend-exclude = "migrations"
diff --git a/releases/migrations/0001_squashed_0004_make_release_date_nullable.py b/releases/migrations/0001_squashed_0004_make_release_date_nullable.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-21 07:11
-from __future__ import unicode_literals
 
 import datetime
 
diff --git a/requirements/common.txt b/requirements/common.txt
@@ -7,13 +7,13 @@ django-push @ git+https://github.com/brutasse/django-push.git@22fda99641cfbd2f30
 django-read-only==1.16.0
 django-recaptcha==4.0.0
 django-registration-redux==2.13
-Django==4.2.15
+Django==4.2.16
 docutils==0.17.1
 feedparser==6.0.11
 Jinja2==3.1.4
 libsass==0.23.0
 Pillow==10.4.0
-psycopg2==2.9.9
+psycopg2==2.9.10
 Pygments==2.18.0
 pykismet3==0.1.1
 requests==2.32.3
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,3 +1,3 @@
 -r common.txt
-pre-commit~=2.20.0
+pre-commit~=3.5.0
 watchdog==4.0.2
diff --git a/tracdb/migrations/0001_initial.py b/tracdb/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
