Switch to prek from pre-commit (#695)

CarrotManMatt · web-flow · commit 930fdeefe7bd · 2025-12-26T13:39:23.000Z
* Switch to prek from pre-commit

* Update away from broken prek version
diff --git a/.github/workflows/check-build-deploy.yaml b/.github/workflows/check-build-deploy.yaml
@@ -136,7 +136,7 @@ jobs:
               with:
                 enable-cache: true
 
-            - name: Install pre-commit From Locked Dependencies
+            - name: Install prek From Locked Dependencies
               run: uv sync --only-group pre-commit
 
             - id: store-hashed-python-version
@@ -146,27 +146,23 @@ jobs:
 
             - uses: actions/cache@v5
               with:
-                key: pre-commit|${{steps.store-hashed-python-version.outputs.hashed_python_version}}|${{hashFiles('.pre-commit-config.yaml')}}
-                path: ~/.cache/pre-commit
+                key: prek|${{steps.store-hashed-python-version.outputs.hashed_python_version}}|${{hashFiles('.pre-commit-config.yaml')}}
+                path: ~/.cache/prek
 
             - name: Setup pre-commit Environments
-              run: uv run -- pre-commit install-hooks
+              run: uv run -- prek install-hooks
 
-            - name: Save pre-commit Checks Which Require Skipping
+            - name: Run prek
               run: |
+                set -o pipefail
                 if [[ "${{github.event_name}}" == "push" && "${{github.ref_name}}" == "${{github.event.repository.default_branch}}" ]]; then
-                    echo "SKIP=flake8,ruff-check,uv-lock,gitlint-ci" >> "$GITHUB_ENV"
+                    uv run -- prek run --all-files --hook-stage manual --color never --skip ruff-check --skip uv-lock --skip gitlint-ci | tee /tmp/prek.log
                 else
-                    echo "SKIP=flake8,ruff-check,uv-lock" >> "$GITHUB_ENV"
+                    uv run -- prek run --all-files --hook-stage manual --color never --skip ruff-check --skip uv-lock | tee /tmp/prek.log
                 fi
 
-            - name: Run pre-commit
-              run: |
-                set -o pipefail
-                uv run -- pre-commit run --all-files --hook-stage manual | tee /tmp/pre-commit.log
-
             - name: Ensure No Warnings
-              run: if grep -q "\[WARNING\]" /tmp/pre-commit.log; then exit 1; fi
+              run: "if grep -q '^warning: ' /tmp/prek.log; then exit 1; fi"
 
             - if: ${{!cancelled()}}
               uses: pre-commit-ci/lite-action@v1.1.0
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,6 +4,16 @@ default_language_version:
 default_stages: [pre-commit, pre-merge-commit, manual]
 
 repos:
+    - repo: https://github.com/tsvikas/sync-with-uv
+      rev: v0.5.0
+      hooks:
+        - id: sync-with-uv
+
+    - repo: https://github.com/codespell-project/codespell
+      rev: v2.4.1
+      hooks:
+        - id: codespell
+
     - repo: https://github.com/rhysd/actionlint
       rev: v1.7.9
       hooks:
@@ -54,31 +64,39 @@ repos:
       rev: v8.30.0
       hooks:
         - id: gitleaks
+          language_version: ">=1.25.4"
 
     - repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v6.0.0
+      hooks:
+        - id: check-illegal-windows-names
+        - id: check-shebang-scripts-are-executable
+        - id: check-vcs-permalinks
+        - id: destroyed-symlinks
+        - id: check-case-conflict
+        - id: name-tests-test
+          args: [--pytest-test-first]
+          files: (?:^|\/)tests\/(?:[^\/]+\/)*(?!_)[^\/]+\.py$  # yamllint disable-line rule:key-ordering
+        - id: pretty-format-json
+          args: [--autofix, --indent, "4"]
+
+    - repo: builtin
       hooks:
         - id: check-added-large-files
         - id: trailing-whitespace
         - id: check-executables-have-shebangs
-        - id: check-illegal-windows-names
-        - id: check-shebang-scripts-are-executable
         - id: check-json
+        - id: check-toml
+        - id: check-yaml
+        - id: end-of-file-fixer
         - id: check-xml
         - id: check-symlinks
         - id: check-merge-conflict
-        - id: check-vcs-permalinks
-        - id: destroyed-symlinks
         - id: mixed-line-ending
           args: [--fix=lf]
-        - id: check-case-conflict
         - id: detect-private-key
         - id: fix-byte-order-marker
           args: [-h]
-        - id: name-tests-test
-          args: [--pytest-test-first]
-        - id: pretty-format-json
-          args: [--autofix, --indent, "4"]
 
     - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
       rev: v2.15.0
@@ -98,26 +116,12 @@ repos:
         - id: uv-lock
           always_run: true
 
-    - repo: local
+    - repo: https://github.com/astral-sh/ruff-pre-commit
+      rev: v0.14.10
       hooks:
         - id: ruff-check
           args: [--fix]
-          description: Run 'ruff check' for extremely fast Python linting  # yamllint disable-line rule:key-ordering
-          entry: ruff check --force-exclude  # yamllint disable-line rule:key-ordering
-          language: python
-          minimum_pre_commit_version: 2.9.2
-          name: ruff check
-          require_serial: true
-          types_or: [python, pyi]
-
         - id: ruff-format
-          description: Run 'ruff format' for extremely fast Python formatting  # yamllint disable-line rule:key-ordering
-          entry: ruff format --force-exclude  # yamllint disable-line rule:key-ordering
-          language: python
-          minimum_pre_commit_version: 2.9.2
-          name: ruff format
-          require_serial: true
-          types_or: [python, pyi]
 
     - repo: https://github.com/google/yamlfmt
       rev: v0.20.0
diff --git a/cogs/committee_actions_tracking.py b/cogs/committee_actions_tracking.py
@@ -88,7 +88,7 @@ async def _create_action(
                 )
             )
             if not error_is_already_exits:
-                await self.command_send_error(ctx, message="An unrecoverable error occured.")
+                await self.command_send_error(ctx, message="An unrecoverable error occurred.")
                 logger.critical("Error upon creating Action object: %s", create_action_error)
                 await self.bot.close()
 
diff --git a/cogs/stats/__init__.py b/cogs/stats/__init__.py
@@ -317,7 +317,7 @@ async def left_member_stats(self, ctx: "TeXBotApplicationContext") -> None:
         await ctx.defer(ephemeral=True)
 
         left_member_counts: dict[str, int] = {
-            "Total": await LeftDiscordMember.objects.acount()
+            "Total": await LeftDiscordMember.objects.acount()  # codespell:ignore acount
         }
 
         role_name: str
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ main = [
     "typed_classproperties>=1.2",
     "validators>=0.34"
 ]
-pre-commit = ["pre-commit>=4.0", { include-group = "lint-format" }]
+pre-commit = ["prek>=0.2,!=0.2.23"]
 test = ["pytest>=9", "pytest-cov>=6.1"]
 type-check = [
     "django-stubs[compatible-mypy]>=5.1",
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ async def _create_action(`
`88`	`88`	`)`
`89`	`89`	`)`
`90`	`90`	`if not error_is_already_exits:`
`91`		`- await self.command_send_error(ctx, message="An unrecoverable error occured.")`
	`91`	`+ await self.command_send_error(ctx, message="An unrecoverable error occurred.")`
`92`	`92`	`logger.critical("Error upon creating Action object: %s", create_action_error)`
`93`	`93`	`await self.bot.close()`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ async def left_member_stats(self, ctx: "TeXBotApplicationContext") -> None:`
`317`	`317`	`await ctx.defer(ephemeral=True)`
`318`	`318`
`319`	`319`	`left_member_counts: dict[str, int] = {`
`320`		`- "Total": await LeftDiscordMember.objects.acount()`
	`320`	`+ "Total": await LeftDiscordMember.objects.acount() # codespell:ignore acount`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`role_name: str`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ main = [`
`27`	`27`	`"typed_classproperties>=1.2",`
`28`	`28`	`"validators>=0.34"`
`29`	`29`	`]`
`30`		`-pre-commit = ["pre-commit>=4.0", { include-group = "lint-format" }]`
	`30`	`+pre-commit = ["prek>=0.2,!=0.2.23"]`
`31`	`31`	`test = ["pytest>=9", "pytest-cov>=6.1"]`
`32`	`32`	`type-check = [`
`33`	`33`	`"django-stubs[compatible-mypy]>=5.1",`