Skip to content

Commit 2a35b4a

Browse files
committed
chore: Sync with WeblateOrg/meta
1 parent ab37307 commit 2a35b4a

File tree

5 files changed

+56
-8
lines changed

5 files changed

+56
-8
lines changed

.editorconfig

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright © Michal Čihař <[email protected]>
2+
#
3+
# SPDX-License-Identifier: CC0-1.0
4+
5+
# This file is maintained in https://github.com/WeblateOrg/meta/
6+
7+
root = true
8+
9+
[*]
10+
indent_style = space
11+
indent_size = 2
12+
end_of_line = lf
13+
charset = utf-8
14+
trim_trailing_whitespace = true
15+
insert_final_newline = true
16+
spaces_around_operators = true
17+
18+
[*.bat]
19+
end_of_line = crlf
20+
21+
[*.html]
22+
indent_size = 2
23+
24+
[*.py]
25+
indent_size = 4
26+
27+
[*.rst]
28+
indent_size = 3
29+
30+
[*.js]
31+
quote_type = double
32+
33+
[*.{markdown,md}]
34+
trim_trailing_whitespace = false
35+
36+
[[shell]]
37+
indent_style = space
38+
indent_size = 4
39+
space_redirects = true
40+
simplify = true

.github/renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
},
5353
{
5454
"matchPackageNames": [
55-
"shellcheck-py/shellcheck-py"
55+
"shellcheck-py/shellcheck-py",
56+
"scop/pre-commit-shfmt"
5657
],
5758
"versioning": "loose"
5859
},

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
fi
4545
- name: pre-commit (PEP 735)
4646
if: steps.detect.outputs.method == 'pep735'
47-
run: uv run --no-sources --only-group pre-commit pre-commit run --all
47+
run: uv run --no-sources --only-group pre-commit pre-commit run --all --show-diff-on-failure
4848
env:
4949
RUFF_OUTPUT_FORMAT: github
5050
REUSE_OUTPUT_FORMAT: github
5151
- name: pre-commit (uvx)
5252
if: steps.detect.outputs.method == 'uvx'
53-
run: uvx pre-commit run --all
53+
run: uvx pre-commit run --all --show-diff-on-failure
5454
env:
5555
RUFF_OUTPUT_FORMAT: github
5656
REUSE_OUTPUT_FORMAT: github
@@ -62,7 +62,7 @@ jobs:
6262
run: uv pip install --system "$(sed -n 's/.*"\(pre-commit==\([^"]*\)\)".*/\1/p' pyproject.toml)"
6363
- name: pre-commit (installed)
6464
if: steps.detect.outputs.method == 'requirements' || steps.detect.outputs.method == 'pyproject'
65-
run: pre-commit run --all
65+
run: pre-commit run --all --show-diff-on-failure
6666
env:
6767
RUFF_OUTPUT_FORMAT: github
6868
REUSE_OUTPUT_FORMAT: github

.pre-commit-config.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ repos:
2929
- id: ruff
3030
args: [--fix, --exit-non-zero-on-fix]
3131
- id: ruff-format
32-
- repo: https://github.com/asottile/blacken-docs
33-
rev: 1.19.1
34-
hooks:
35-
- id: blacken-docs
3632
- repo: meta
3733
hooks:
3834
- id: check-hooks-apply
@@ -83,5 +79,13 @@ repos:
8379
rev: v1.7.7
8480
hooks:
8581
- id: actionlint
82+
- repo: https://github.com/adamchainz/blacken-docs
83+
rev: 1.19.1
84+
hooks:
85+
- id: blacken-docs
86+
- repo: https://github.com/scop/pre-commit-shfmt
87+
rev: v3.11.0-1
88+
hooks:
89+
- id: shfmt
8690
ci:
8791
autoupdate_schedule: quarterly

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ profile = "black"
103103
[tool.ruff]
104104
target-version = "py39"
105105

106+
[tool.ruff.format]
107+
docstring-code-format = true
108+
106109
[tool.ruff.lint]
107110
ignore = [
108111
"COM812", # CONFIG: trailing newlines

0 commit comments

Comments
 (0)