Skip to content

Commit 0d051e3

Browse files
authored
Merge pull request #16
Small tweaks trying to work around prettier
2 parents 588cac3 + 6023185 commit 0d051e3

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.editorconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ end_of_line = lf
66
insert_final_newline = true
77
trim_trailing_whitespace = true
88
max_line_length = 120
9-
tab_width = 4
10-
ij_continuation_indent_size = 8
119
ij_formatter_off_tag = @formatter:off
1210
ij_formatter_on_tag = @formatter:on
1311
ij_formatter_tags_enabled = true
@@ -19,7 +17,7 @@ ij_wrap_on_typing = false
1917
indent_style = space
2018
indent_size = 4
2119

22-
[*.yml,yaml,json]
20+
[{*.yml,*.yaml,*.json}]
2321
indent_style = space
2422
indent_size = 2
2523

{{cookiecutter.project_name}}/.pre-commit-config.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ repos:
1919
entry: check-yaml
2020
language: system
2121
types: [yaml]
22-
- id: darglint
23-
name: darglint
24-
entry: darglint
25-
language: system
26-
types: [python]
27-
stages: [manual]
2822
- id: end-of-file-fixer
2923
name: Fix End of Files
3024
entry: end-of-file-fixer
@@ -43,26 +37,34 @@ repos:
4337
hooks:
4438
- id: ruff-format
4539
args: [--config=.ruff.toml]
40+
name: Ruff Format
4641

4742
- id: ruff-check
4843
args: [--fix, --diff, --exit-non-zero-on-fix, --config=.ruff.toml]
44+
name: Ruff Check
4945

5046
- repo: https://github.com/doublify/pre-commit-rust
5147
rev: master
5248
hooks:
5349
- id: fmt
50+
name: Rust Format
5451
- id: clippy
5552
args: ["--all-features", "--", "--write"]
53+
name: Clippy
5654
- id: cargo-check
55+
name: Cargo Check
5756

5857
- repo: https://github.com/pre-commit/mirrors-prettier
5958
rev: v2.6.0
6059
hooks:
6160
- id: prettier
61+
name: Prettier
6262

6363
- repo: https://github.com/commitizen-tools/commitizen
6464
rev: v4.8.2
6565
hooks:
6666
- id: commitizen
67+
name: Commitizen
6768
- id: commitizen-branch
69+
name: Commitizen Branch
6870
stages: [ commit-msg ]

{{cookiecutter.project_name}}/noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def setup_venv(session: Session) -> None:
6262
@nox.session(python=DEFAULT_PYTHON_VERSION, name="pre-commit", tags=[CI])
6363
def precommit(session: Session) -> None:
6464
"""Lint using pre-commit."""
65-
args: list[str] = session.posargs or ["run", "--all-files", "--hook-stage=manual", "--show-diff-on-failure"]
65+
args: list[str] = session.posargs or ["run", "--all-files", "--show-diff-on-failure"]
6666

6767
session.log("Installing pre-commit dependencies...")
6868
session.install("-e", ".", "--group", "dev")

0 commit comments

Comments
 (0)