From ea314a6ae366c847b0ccfbd2e25b6bbab9166881 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:51:50 +0200 Subject: [PATCH 1/2] Auto-update pre-commit hooks (#1147) Co-authored-by: github-actions[bot] (cherry picked from commit 6255cff6dee37cb2f3a6fd524b04ee0e544296f3) # Conflicts: # .pre-commit-config.yaml --- .pre-commit-config.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 12bb9eaae..7da665d0d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,13 +33,21 @@ repos: # Python hooks - repo: https://github.com/asottile/pyupgrade +<<<<<<< HEAD rev: v3.9.0 +======= + rev: v3.18.0 +>>>>>>> 6255cff (Auto-update pre-commit hooks (#1147)) hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/psf/black +<<<<<<< HEAD rev: 23.3.0 +======= + rev: 24.10.0 +>>>>>>> 6255cff (Auto-update pre-commit hooks (#1147)) hooks: - id: black args: ["--line-length=100"] From 5d5f36498bc54199b186071e2ce7474baa3bac04 Mon Sep 17 00:00:00 2001 From: "Felix Exner (fexner)" Date: Mon, 14 Oct 2024 08:55:01 +0200 Subject: [PATCH 2/2] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7da665d0d..7953ec957 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,21 +33,13 @@ repos: # Python hooks - repo: https://github.com/asottile/pyupgrade -<<<<<<< HEAD - rev: v3.9.0 -======= rev: v3.18.0 ->>>>>>> 6255cff (Auto-update pre-commit hooks (#1147)) hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/psf/black -<<<<<<< HEAD - rev: 23.3.0 -======= rev: 24.10.0 ->>>>>>> 6255cff (Auto-update pre-commit hooks (#1147)) hooks: - id: black args: ["--line-length=100"]