From 31f0cd977bb96da0ca1cd79f0a5c71ae049692ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 01:35:16 +0000 Subject: [PATCH 1/8] MAINT: bump the lock group with 2 updates Bumps the lock group with 2 updates: [https://github.com/ComPWA/policy](https://github.com/ComPWA/policy) and [https://github.com/streetsidesoftware/cspell-cli](https://github.com/streetsidesoftware/cspell-cli). Updates `https://github.com/ComPWA/policy` from 0.8.9 to 0.8.13 - [Release notes](https://github.com/ComPWA/policy/releases) - [Commits](https://github.com/ComPWA/policy/compare/0.8.9...0.8.13) Updates `https://github.com/streetsidesoftware/cspell-cli` from v10.0.0 to 10.0.1 - [Release notes](https://github.com/streetsidesoftware/cspell-cli/releases) - [Changelog](https://github.com/streetsidesoftware/cspell-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell-cli/compare/v10.0.0...v10.0.1) --- updated-dependencies: - dependency-name: https://github.com/ComPWA/policy dependency-version: 0.8.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lock - dependency-name: https://github.com/streetsidesoftware/cspell-cli dependency-version: 10.0.1 dependency-type: direct:production dependency-group: lock ... Signed-off-by: dependabot[bot] --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 036b1bf..3f16308 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/policy - rev: 0.8.9 + rev: 0.8.13 hooks: - id: check-dev-files args: @@ -49,7 +49,7 @@ repos: args: [--in-place] - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v10.0.0 + rev: v10.0.1 hooks: - id: cspell language_version: 25.9.0 From f06b6dc8c00ac4636546edf68bb376c49f996950 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sun, 5 Jul 2026 15:32:32 +0200 Subject: [PATCH 2/8] MAINT: remove `.python-version` --- .python-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .python-version diff --git a/.python-version b/.python-version deleted file mode 100644 index e4fba21..0000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.12 From 5f75ccb8859261b63923eaeef213a4eb05c3315a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sun, 5 Jul 2026 15:33:04 +0200 Subject: [PATCH 3/8] MAINT: install and implement ComPWA/policy@15362d4 --- .pre-commit-config.yaml | 10 +--------- pyproject.toml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3f16308..cc63eaf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,17 +10,9 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/policy - rev: 0.8.13 + rev: 15362d4c0f603c124978ece1b3b5c9629c852d51 hooks: - id: check-dev-files - args: - - --no-cd - - --keep-issue-templates - - --no-pypi - - --package-manager=none - - --repo-name=.github - - --repo-title=Public ComPWA GitHub profile - - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 hooks: diff --git a/pyproject.toml b/pyproject.toml index 7cc1caa..4c881b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,15 @@ +[tool.compwa.policy] +package-manager = "none" +repo-name = ".github" +repo-title = "Public ComPWA GitHub profile" + +[tool.compwa.policy.github] +no-cd = true +no-pypi = true + +[tool.compwa.policy.repo] +keep-issue-templates = true + [tool.tomlsort] all = false ignore_case = true From 64c36eca562e4579bf73905ed2ae5462cd3a0d9a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 11:41:13 +0200 Subject: [PATCH 4/8] MAINT: upgrade lock files (#37) From 670e7f88e342658befad51c963cb53061ac91da3 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Wed, 8 Jul 2026 23:49:28 +0200 Subject: [PATCH 5/8] MAINT: upgrade lock files --- .pre-commit-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cc63eaf..2678e8d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,9 +10,10 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/policy - rev: 15362d4c0f603c124978ece1b3b5c9629c852d51 + rev: 25e781ae72399eead3a5a6c272a601d84fd98f22 hooks: - id: check-dev-files + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 hooks: From 8a83796ef880eba6c3d16a62887ad80070aec843 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Tue, 14 Jul 2026 17:09:33 +0200 Subject: [PATCH 6/8] DX: use Tombi as TOML formatter --- .cspell.json | 1 - .github/workflows/ci.yml | 25 +++++++++++++++++++++++++ .pre-commit-config.yaml | 23 +++++++++++------------ .taplo.toml | 12 ------------ .vscode/extensions.json | 3 ++- pyproject.toml | 17 +++++++++++------ 6 files changed, 49 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .taplo.toml diff --git a/.cspell.json b/.cspell.json index fa1d406..5df0a82 100644 --- a/.cspell.json +++ b/.cspell.json @@ -23,7 +23,6 @@ ".github/dependabot.yml", ".gitignore", ".pre-commit-config.yaml", - ".taplo.toml", ".vscode/*", "pyproject.toml" ], diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1e0cdb1 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,25 @@ +name: CI + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: |- + ${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }} + +on: + push: + branches: + - main + - epic/* + - "[0-9]+.[0-9]+.x" + pull_request: + branches: + - main + - epic/* + - "[0-9]+.[0-9]+.x" + workflow_dispatch: + +jobs: + style: + secrets: + token: ${{ secrets.PAT }} + uses: ComPWA/actions/.github/workflows/style.yml@v4.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2678e8d..9821be2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,9 @@ ci: autofix_commit_msg: "MAINT: implement pre-commit autofixes" autoupdate_commit_msg: "MAINT: upgrade lock files" autoupdate_schedule: quarterly + skip: + - tombi-format + - tombi-lint repos: - repo: meta @@ -10,7 +13,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/policy - rev: 25e781ae72399eead3a5a6c272a601d84fd98f22 + rev: fdca003de17ea0a024319f777530f771dd1d8e59 hooks: - id: check-dev-files @@ -25,22 +28,18 @@ repos: - id: mixed-line-ending - id: trailing-whitespace + - repo: https://github.com/tombi-toml/tombi-pre-commit + rev: v1.2.0 + hooks: + - id: tombi-format + - id: tombi-lint + args: [--error-on-warnings] + - repo: https://github.com/ComPWA/prettier-pre-commit rev: v3.8.1 hooks: - id: prettier - - repo: https://github.com/ComPWA/taplo-pre-commit - rev: v0.9.3 - hooks: - - id: taplo-format - - - repo: https://github.com/pappasam/toml-sort - rev: v0.24.4 - hooks: - - id: toml-sort - args: [--in-place] - - repo: https://github.com/streetsidesoftware/cspell-cli rev: v10.0.1 hooks: diff --git a/.taplo.toml b/.taplo.toml deleted file mode 100644 index 0db1df7..0000000 --- a/.taplo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[formatting] -align_comments = false -align_entries = false -allowed_blank_lines = 1 -array_auto_collapse = false -array_auto_expand = true -array_trailing_comma = true -column_width = 88 -compact_inline_tables = true -indent_string = " " -reorder_arrays = true -reorder_keys = true diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 443281a..082cde1 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -8,7 +8,7 @@ "soulcode.vscode-unwanted-extensions", "stkb.rewrap", "streetsidesoftware.code-spell-checker", - "tamasfe.even-better-toml" + "tombi-toml.tombi" ], "unwantedRecommendations": [ "bungcip.better-toml", @@ -17,6 +17,7 @@ "ms-python.flake8", "ms-python.isort", "ms-python.pylint", + "tamasfe.even-better-toml", "travisillig.vscode-json-stable-stringify", "tyriar.sort-lines" ] diff --git a/pyproject.toml b/pyproject.toml index 4c881b1..ce17dd7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,9 +10,14 @@ no-pypi = true [tool.compwa.policy.repo] keep-issue-templates = true -[tool.tomlsort] -all = false -ignore_case = true -in_place = true -spaces_indent_inline_array = 4 -trailing_comma_inline_array = true +[tool.tombi.format.rules] +indent-width = 4 +line-width = 88 + +[tool.tombi.lint.rules] +key-empty = "off" + +[[tool.tombi.schemas]] +root = "tool.compwa.policy" +path = "https://raw.githubusercontent.com/ComPWA/policy/fdca003de17ea0a024319f777530f771dd1d8e59/compwa-policy.schema.json" +include = ["pyproject.toml"] From 1643636bb0a55a343b02be77334be2dd9577a3d3 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Wed, 15 Jul 2026 15:10:02 +0200 Subject: [PATCH 7/8] MAINT: upgrade lock files --- .pre-commit-config.yaml | 2 +- .vscode/settings.json | 3 +++ pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9821be2..a11f16e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/policy - rev: fdca003de17ea0a024319f777530f771dd1d8e59 + rev: 0.9.0 hooks: - id: check-dev-files diff --git a/.vscode/settings.json b/.vscode/settings.json index f6fc0a7..6575ab3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,9 @@ "[json]": { "editor.wordWrap": "on" }, + "[toml]": { + "editor.defaultFormatter": "tombi-toml.tombi" + }, "diffEditor.experimental.showMoves": true, "editor.formatOnSave": true, "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], diff --git a/pyproject.toml b/pyproject.toml index ce17dd7..35aad23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,5 +19,5 @@ key-empty = "off" [[tool.tombi.schemas]] root = "tool.compwa.policy" -path = "https://raw.githubusercontent.com/ComPWA/policy/fdca003de17ea0a024319f777530f771dd1d8e59/compwa-policy.schema.json" +path = "https://raw.githubusercontent.com/ComPWA/policy/0.9.0/compwa-policy.schema.json" include = ["pyproject.toml"] From 89ed10afba733238e3d38b99f6984ee7f1860353 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Wed, 15 Jul 2026 18:03:30 +0200 Subject: [PATCH 8/8] DX: define `poe` tasks --- pyproject.toml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 35aad23..7bce952 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,24 @@ no-pypi = true [tool.compwa.policy.repo] keep-issue-templates = true +[tool.poe.tasks.all] +help = "Run all continuous integration (CI) tasks locally" +sequence = ["style"] + +[tool.poe.tasks.style] +cmd = "pre-commit run --all-files" +executor = { type = "simple" } +help = "Perform all linting, formatting, and spelling checks" + +[tool.poe.tasks.upgrade] +executor = { type = "simple" } +help = "Upgrade lock files" +parallel = ["_upgrade-precommit"] + +[tool.poe.tasks._upgrade-precommit] +cmd = "pre-commit autoupdate -j8" +executor = { type = "simple" } + [tool.tombi.format.rules] indent-width = 4 line-width = 88