From b7f41df3f15cd3b511495fef9b93bf58b390b8ff Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Sat, 18 Jan 2025 12:53:17 -0500 Subject: [PATCH 1/2] Fix merge conflicts. --- .pre-commit-config.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2f00bae944f2f..7f38c3e848f03d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.2 + rev: v0.9.1 hooks: - id: ruff name: Run Ruff (lint) on Doc/ @@ -25,7 +25,6 @@ repos: - id: black name: Run Black on Tools/jit/ files: ^Tools/jit/ - language_version: python3.12 - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 @@ -42,7 +41,7 @@ repos: types_or: [c, inc, python, rst] - repo: https://github.com/woodruffw/zizmor-pre-commit - rev: v0.8.0 + rev: v1.1.1 hooks: - id: zizmor From 6df26a702c335588f66ed8efa9793c04a46f1052 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Sat, 18 Jan 2025 13:24:06 -0500 Subject: [PATCH 2/2] [3.13] Pre-commit: Drop specific language version and bump hooks (GH-128801) (cherry picked from commit 3de7cc15c2f3186b84c0fb105bc84c27e9589902) Co-authored-by: Peter Bierma