From 6a96a798df597cc3f901f962fc0bf18699b56cb6 Mon Sep 17 00:00:00 2001 From: Paddy Roddy Date: Wed, 25 Oct 2023 14:08:12 +0100 Subject: [PATCH 1/4] Exclude lock files and don't just write changes --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8d6d089a..374e934b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: rev: v2.2.6 hooks: - id: codespell - args: [--write-changes] + exclude: ".lock$" - repo: https://github.com/Lucas-C/pre-commit-hooks rev: v1.5.4 hooks: From 44a5a0699230d57cc3b35bb8f12d3fe0f9e67019 Mon Sep 17 00:00:00 2001 From: Paddy Roddy Date: Wed, 25 Oct 2023 14:08:31 +0100 Subject: [PATCH 2/4] Update lock file --- docs/Gemfile.lock | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index e1f4727e..cf7ec0f5 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -9,8 +9,10 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.16.2) + ffi (1.16.3) forwardable-extended (2.6.0) + google-protobuf (3.24.4-arm64-darwin) + google-protobuf (3.24.4-x86_64-linux) http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -32,8 +34,8 @@ GEM webrick (~> 1.7) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) @@ -60,13 +62,15 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.6) - rouge (4.1.3) + rouge (4.2.0) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) + sass-embedded (1.69.4-arm64-darwin) + google-protobuf (~> 3.23) + sass-embedded (1.69.4-x86_64-linux-gnu) + google-protobuf (~> 3.23) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) PLATFORMS @@ -78,4 +82,4 @@ DEPENDENCIES just-the-docs (= 0.6.2) BUNDLED WITH - 2.3.9 + 2.4.21 From 1c4357ade9e9d7e8111c307da73317218a93a3b6 Mon Sep 17 00:00:00 2001 From: Paddy Roddy Date: Wed, 25 Oct 2023 14:13:24 +0100 Subject: [PATCH 3/4] More args into own line --- .pre-commit-config.yaml | 15 ++++++++++----- .../.pre-commit-config.yaml | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 374e934b..5b33a6b8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,10 +6,12 @@ repos: rev: v0.1.2 hooks: - id: ruff - args: ["--config", "pyproject.toml"] + args: + - --config=pyproject.toml exclude: "{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}" - id: ruff-format - args: ["--config", "pyproject.toml"] + args: + - --config=pyproject.toml - repo: https://github.com/codespell-project/codespell rev: v2.2.6 hooks: @@ -28,8 +30,10 @@ repos: rev: v1.6.1 hooks: - id: mypy - args: [--config-file, pyproject.toml] - additional_dependencies: ["pytest"] + args: + - --config-file=pyproject.toml + additional_dependencies: + - pytest exclude: "{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}" - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.0.3 @@ -44,7 +48,8 @@ repos: - id: check-merge-conflict - id: end-of-file-fixer - id: mixed-line-ending - args: [--fix=lf] + args: + - --fix=lf - id: trailing-whitespace - repo: https://github.com/renovatebot/pre-commit-hooks rev: 37.33.0 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 7f0ff0f5..9114a289 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,6 @@ repos: rev: v1.6.1 hooks: - id: mypy - additional_dependencies: [numpy, pydantic] - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.0.3 hooks: @@ -30,5 +29,6 @@ repos: - id: check-toml - id: end-of-file-fixer - id: mixed-line-ending - args: [--fix=lf] + args: + - --fix=lf - id: trailing-whitespace From 6e2afdc5bbcf7030b2291ba5a2ffd43c745c73c0 Mon Sep 17 00:00:00 2001 From: Paddy Roddy Date: Wed, 25 Oct 2023 14:13:34 +0100 Subject: [PATCH 4/4] Add `codespell` in nested `pre-commit` --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 9114a289..cf12a6c4 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -4,6 +4,10 @@ repos: hooks: - id: ruff - id: ruff-format + - repo: https://github.com/codespell-project/codespell + rev: v2.2.6 + hooks: + - id: codespell - repo: https://github.com/Lucas-C/pre-commit-hooks rev: v1.5.4 hooks: