diff --git a/.cspell.json b/.cspell.json index da749b6..31f0a44 100644 --- a/.cspell.json +++ b/.cspell.json @@ -1,5 +1,4 @@ { - "version": "0.2", "enableFiletypes": [ "git-commit", "github-actions-workflow", @@ -23,11 +22,10 @@ "**/.cspell.json", ".gitignore", ".pre-commit-config.yaml", + ".taplo.toml", ".vscode/*", "pyproject.toml" ], - "language": "en-US", - "words": ["ampform", "compwa", "qrules", "tensorwaves", "Zenodo"], "ignoreWords": [ "Conda", "MAINT", @@ -42,5 +40,9 @@ "sdist", "setuptools", "venv" - ] + ], + "language": "en-US", + "useGitignore": true, + "version": "0.2", + "words": ["ampform", "compwa", "qrules", "tensorwaves", "Zenodo"] } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 069a780..a2598ed 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/policy - rev: 0.5.3 + rev: 0.5.15 hooks: - id: check-dev-files args: @@ -33,7 +33,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/prettier-pre-commit - rev: v3.3.3 + rev: v3.4.2 hooks: - id: prettier @@ -43,12 +43,12 @@ repos: - id: taplo-format - repo: https://github.com/pappasam/toml-sort - rev: v0.23.1 + rev: v0.24.2 hooks: - id: toml-sort args: [--in-place] - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v8.15.2 + rev: v8.17.0 hooks: - id: cspell diff --git a/.taplo.toml b/.taplo.toml index 0db1df7..71fcb1b 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -10,3 +10,10 @@ compact_inline_tables = true indent_string = " " reorder_arrays = true reorder_keys = true + +[[rule]] +include = ["**/pyproject.toml"] +keys = ["tool.tox"] + +[rule.formatting] +reorder_arrays = false diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 18d0b52..443281a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,7 @@ "eamodio.gitlens", "esbenp.prettier-vscode", "github.vscode-github-actions", + "github.vscode-pull-request-github", "mhutchie.git-graph", "soulcode.vscode-unwanted-extensions", "stkb.rewrap", diff --git a/pyproject.toml b/pyproject.toml index b59d4f4..7cc1caa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,11 +2,5 @@ all = false ignore_case = true in_place = true -sort_first = [ - "build-system", - "project", - "tool.setuptools", - "tool.setuptools_scm", -] spaces_indent_inline_array = 4 trailing_comma_inline_array = true