From 2d29aa20369b6dc50f1be77774bfaf528fb4b107 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Mon, 27 Oct 2025 16:14:48 +0200
Subject: [PATCH] [3.13] gh-92266: Update pre-commit (GH-139411) (#139760)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 .github/actionlint.yaml        | 12 ++++++++++++
 .pre-commit-config.yaml        | 28 ++++++++++++++++++++--------
 Tools/build/.ruff.toml         |  1 -
 Tools/clinic/.ruff.toml        |  3 ---
 Tools/peg_generator/.ruff.toml |  5 -----
 5 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 .github/actionlint.yaml

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
new file mode 100644
index 000000000000..267ff6b42a86
--- /dev/null
+++ b/.github/actionlint.yaml
@@ -0,0 +1,12 @@
+self-hosted-runner:
+  # Pending https://github.com/rhysd/actionlint/issues/533
+  # and https://github.com/rhysd/actionlint/issues/571
+  labels: ["windows-11-arm", "macos-15-intel"]
+
+config-variables: null
+
+paths:
+  .github/workflows/**/*.yml:
+     ignore:
+     - 1st argument of function call is not assignable
+     - SC2(015|038|086|091|097|098|129|155)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 977b4bd6b33a..aa5dab0ad16d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,24 +1,24 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.8
+    rev: v0.13.2
     hooks:
-      - id: ruff
+      - id: ruff-check
         name: Run Ruff (lint) on Doc/
         args: [--exit-non-zero-on-fix]
         files: ^Doc/
-      - id: ruff
+      - id: ruff-check
         name: Run Ruff (lint) on Lib/test/
         args: [--exit-non-zero-on-fix]
         files: ^Lib/test/
-      - id: ruff
+      - id: ruff-check
         name: Run Ruff (lint) on Tools/i18n/
         args: [--exit-non-zero-on-fix, --config=Tools/i18n/.ruff.toml]
         files: ^Tools/i18n/
-      - id: ruff
+      - id: ruff-check
         name: Run Ruff (lint) on Argument Clinic
         args: [--exit-non-zero-on-fix, --config=Tools/clinic/.ruff.toml]
         files: ^Tools/clinic/|Lib/test/test_clinic.py
-      - id: ruff
+      - id: ruff-check
         name: Run Ruff (lint) on Tools/peg_generator/
         args: [--exit-non-zero-on-fix, --config=Tools/peg_generator/.ruff.toml]
         files: ^Tools/peg_generator/
@@ -32,7 +32,7 @@ repos:
         files: ^Tools/wasm/
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
+    rev: 25.9.0
     hooks:
       - id: black
         name: Run Black on Tools/jit/
@@ -63,8 +63,20 @@ repos:
       - id: trailing-whitespace
         files: '^\.github/CODEOWNERS|\.(gram)$'
 
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.34.0
+    hooks:
+      - id: check-dependabot
+      - id: check-github-workflows
+      - id: check-readthedocs
+
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.7
+    hooks:
+      - id: actionlint
+
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.11.0
+    rev: v1.14.1
     hooks:
       - id: zizmor
 
diff --git a/Tools/build/.ruff.toml b/Tools/build/.ruff.toml
index dcbf2936290f..996f725fdcb9 100644
--- a/Tools/build/.ruff.toml
+++ b/Tools/build/.ruff.toml
@@ -29,7 +29,6 @@ ignore = [
     "F541",    # f-string without any placeholders
     "PYI024",  # Use `typing.NamedTuple` instead of `collections.namedtuple`
     "PYI025",  # Use `from collections.abc import Set as AbstractSet`
-    "UP038",   # Use `X | Y` in `isinstance` call instead of `(X, Y)`
 ]
 
 [lint.per-file-ignores]
diff --git a/Tools/clinic/.ruff.toml b/Tools/clinic/.ruff.toml
index 5033887df0c1..944d17ee3e98 100644
--- a/Tools/clinic/.ruff.toml
+++ b/Tools/clinic/.ruff.toml
@@ -17,9 +17,6 @@ ignore = [
     # Use f-strings instead of format specifiers.
     # Doesn't always make code more readable.
     "UP032",
-    # Use PEP-604 unions rather than tuples for isinstance() checks.
-    # Makes code slower and more verbose. https://github.com/astral-sh/ruff/issues/7871.
-    "UP038",
 ]
 unfixable = [
     # The autofixes sometimes do the wrong things for these;
diff --git a/Tools/peg_generator/.ruff.toml b/Tools/peg_generator/.ruff.toml
index d778cf0df9b4..bcf57248713d 100644
--- a/Tools/peg_generator/.ruff.toml
+++ b/Tools/peg_generator/.ruff.toml
@@ -13,11 +13,6 @@ select = [
     "RUF100",  # Ban unused `# noqa` comments
     "PGH004",  # Ban blanket `# noqa` comments (only ignore specific error codes)
 ]
-ignore = [
-    # Use PEP-604 unions rather than tuples for isinstance() checks.
-    # Makes code slower and more verbose. https://github.com/astral-sh/ruff/issues/7871.
-    "UP038",
-]
 unfixable = [
     # The autofixes sometimes do the wrong things for these;
     # it's better to have to manually look at the code and see how it needs fixing
-- 
2.47.3