From a12d529b18027ac3d8c43c09ed6b114a1f8591b2 Mon Sep 17 00:00:00 2001 From: Lukas Devos Date: Sun, 8 Dec 2024 09:06:34 -0500 Subject: [PATCH 1/2] Update precommit --- .JuliaFormatter.toml | 2 +- .pre-commit-config.yaml | 9 ++++++--- templates/precommit/.pre-commit-config.yaml | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.JuliaFormatter.toml b/.JuliaFormatter.toml index 376ec44..82c6fca 100644 --- a/.JuliaFormatter.toml +++ b/.JuliaFormatter.toml @@ -1,4 +1,4 @@ # See https://domluna.github.io/JuliaFormatter.jl/stable/ for a list of options style = "blue" -ignore = ["templates"] +ignore = ["templates/*"] indent = 2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bff1fb7..67131e2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,10 +4,13 @@ repos: hooks: - id: check-merge-conflict - id: check-toml + exclude: (/.*)?templates(/.*)?$ - id: check-yaml + exclude: (/.*)?templates(/.*)?$ - id: end-of-file-fixer exclude_types: [markdown] # incompatible with Literate.jl -- repo: https://github.com/qiaojunfeng/pre-commit-julia-format - rev: v0.2.0 + +- repo: "https://github.com/domluna/JuliaFormatter.jl" + rev: v2.0.0 hooks: - - id: julia-format + - id: "julia-formatter" diff --git a/templates/precommit/.pre-commit-config.yaml b/templates/precommit/.pre-commit-config.yaml index bff1fb7..242fae3 100644 --- a/templates/precommit/.pre-commit-config.yaml +++ b/templates/precommit/.pre-commit-config.yaml @@ -7,7 +7,8 @@ repos: - id: check-yaml - id: end-of-file-fixer exclude_types: [markdown] # incompatible with Literate.jl -- repo: https://github.com/qiaojunfeng/pre-commit-julia-format - rev: v0.2.0 + +- repo: "https://github.com/domluna/JuliaFormatter.jl" + rev: v2.0.0 hooks: - - id: julia-format + - id: "julia-formatter" From 32d14619d00d26c1b9db1b733e5a50181806f74c Mon Sep 17 00:00:00 2001 From: Lukas Devos Date: Sun, 8 Dec 2024 15:06:31 -0500 Subject: [PATCH 2/2] switch to stable release of JuliaFormatter --- .pre-commit-config.yaml | 2 +- templates/precommit/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 67131e2..daf5b40 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,6 +11,6 @@ repos: exclude_types: [markdown] # incompatible with Literate.jl - repo: "https://github.com/domluna/JuliaFormatter.jl" - rev: v2.0.0 + rev: v1.0.62 hooks: - id: "julia-formatter" diff --git a/templates/precommit/.pre-commit-config.yaml b/templates/precommit/.pre-commit-config.yaml index 242fae3..6599365 100644 --- a/templates/precommit/.pre-commit-config.yaml +++ b/templates/precommit/.pre-commit-config.yaml @@ -9,6 +9,6 @@ repos: exclude_types: [markdown] # incompatible with Literate.jl - repo: "https://github.com/domluna/JuliaFormatter.jl" - rev: v2.0.0 + rev: v1.0.62 hooks: - id: "julia-formatter"