Skip to content

style: format pyproject.toml with tombi - #506

Merged
lengau merged 1 commit into
canonical:mainfrom
dangertoaster:work/bot/tombi-pyproject
Oct 20, 2026
Merged

lengau merged 1 commit into
canonical:mainfrom
dangertoaster:work/bot/tombi-pyproject

Conversation

@dangertoaster

Copy link
Copy Markdown
Contributor

🤖 This message was generated by kimi-k3.

Summary

Purely mechanical reformatting of pyproject.toml with tombi format — no logic or configuration changes. The diff consists exclusively of:

  • Array indentation normalized (4-space → 2-space)
  • Key and table-section ordering normalized
  • Inline comment spacing normalized

All values, comments, and semantics are unchanged; the full diff was inspected line-by-line to confirm.

Motivation

The shared Starcraft build tooling (canonical/starbase common.mk) adds format-tombi/lint-tombi targets that run tombi format over the repository's TOML files. Landing this mechanical reformat separately keeps the upcoming Starbase merge diff reviewable and lets this change be reverted independently if needed.

Validation

  • uv lock --check — passed (no lockfile update needed)
  • tombi format --check — passes
  • uv run pytest tests/unit -q — 684 passed, 1 skipped

Provenance

Discovered while validating the Starbase sync merge for this repository: the updated common.mk from canonical/starbase adds the format-tombi and lint-tombi targets. This is a preparation PR for that starbase update.

Preparation for the upcoming Starbase sync, whose common.mk adds
format-tombi/lint-tombi targets. Purely mechanical: array indentation,
key/section ordering, and inline-comment spacing. No semantic changes.
@dangertoaster
dangertoaster force-pushed the work/bot/tombi-pyproject branch from a92a1ce to 0bfaeda Compare October 16, 2026 15:00
dangertoaster added a commit to dangertoaster/craft-cli that referenced this pull request Oct 16, 2026
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@bepri
bepri marked this pull request as ready for review October 16, 2026 17:02
@bepri
bepri self-requested a review as a code owner October 16, 2026 17:02
Copilot AI lite review requested due to automatic review settings October 16, 2026 17:02
@bepri
bepri requested a review from a team October 16, 2026 17:02

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

Formatting-only changes were reviewed with no unresolved issues.

0 open findings

What changed in this PR

Reformats pyproject.toml with Tombi while preserving configuration semantics.

Changes:

  • Normalizes indentation and comment spacing.
  • Reorders keys, tables, and array entries.
File Description
pyproject.toml Mechanical TOML formatting and ordering updates.

🧠 Review effort: Lite


💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@lengau
lengau merged commit 780170f into canonical:main Oct 20, 2026
30 of 31 checks passed
dangertoaster added a commit to dangertoaster/craft-cli that referenced this pull request Oct 20, 2026
Merge `starbase/main` into this branch and sync Starbase-managed updates.

Overview of Starbase changes pulled in:
- CI workflows: new actionlint, zizmor, and copilot-setup-steps configs;
  updated check-renovate, policy, release-publish, and TICS workflows
- Build tooling: common.mk updates, new lint-code/lint-uv-lockfile/lint-actions
  targets, and the shared ruff-pre-commit hook configuration
- Docs tooling: Sphinx Stack updates (sitemap, llms.txt, sphinx-rerediraffe
  0.3.0, meta descriptions on Diátaxis landing pages)
- Agent guidance: never invoke the docs Makefile directly (`make -C docs`),
  use repository-root `make docs-<target>` instead (starbase #636)
- osv-scanner configuration

Conflict resolution applied:
- Kept child-repo version of `.github/CODEOWNERS` (`--ours`).
- Kept child-repo version of `.github/workflows/qa.yaml` (`--ours`).
- Kept child-repo version of `uv.lock` (`--ours`), then regenerated with
  `uv lock` for the merged docs dependency group.
- Kept child-repo version of `README.md` (Starbase-owned scaffold README is
  for new projects; this repo's README is already established).
- Kept child-repo version of `CONTRIBUTING.md` (library repos keep their
  repository-specific contribution guide); removed a leftover `|||||||`
  base marker line from the conflict resolution.
- Kept child-repo version of `tests/conftest.py` (`--ours`).
- Took full `common.mk` from `starbase/main` (source-of-truth file).
- Took full `.github/workflows/check-renovate.yaml`,
  `.github/workflows/policy.yaml`, and
  `.github/workflows/release-publish.yaml` from `starbase/main`
  (source-of-truth files).
- `.github/workflows/tics.yaml`: took Starbase structure with the reusable
  workflow call, keeping `with.project` set to `craft-cli`.
- `.pre-commit-config.yaml`: took Starbase hook set, but kept the newer
  ruff-pre-commit pin from origin/main (v0.17.1 with the renamed `ruff`
  hook id) per the never-downgrade rule — Starbase is at v0.17.0.
- `Makefile`: took Starbase lint/lint-code targets; kept child-owned
  `PROJECT=craft_cli`; dropped the local `lint-ty`/`install-ty` duplicates
  now provided by common.mk.
- `docs/conf.py`: kept Starbase docs scaffold structure with child-owned
  values (project, author, copyright start year 2021, ogp_* and html_context
  URLs, llms_txt_description, LGPL-3.0 license, autodoc/apidoc setup).
- `docs/.custom_wordlist.txt`: merged child entries with new shared tooling
  terms; excluded `Starbase`/`Starcraft` per policy.
- `docs/.gitignore`: took Starbase version, appended child repo-specific
  generated Sphinx file entries.
- `docs/**/*.rst`: kept child documentation pages, adopting new meta
  descriptions and prose from Starbase with `Starcraft` substituted by
  `Craft CLI`.
- `pyproject.toml`: kept child-owned `[project]`, `[dependency-groups]`,
  `[build-system]`, and ruff src/extend-exclude/lint deltas; took
  `starbase/main` for `docs-sphinx-stack`, `[tool.setuptools_scm]` structure,
  and merged `tool.uv.constraint-dependencies` keeping the higher version
  from each side. Formatted with tombi per the new format-tombi target.
- Deleted `docs/release-notes/`, `.github/README.md`,
  `tests/unit/starbase/test_init.py`, and the leftover
  `docs/.sphinx/spellingcheck.yaml` (library repository per file-ownership
  rule 1b; `docs/.sphinx/` superseded by `docs/_dev/`).
- For this library repo: kept `AGENTS.md` authoritative and applied relevant
  updates from `AGENTS.lib.md` (including the new make docs-<target>
  guidance); kept both `AGENTS.app.md` and `AGENTS.lib.md` deleted.
- `tests/unit/test_messages_emitter.py`: removed `# noqa: FBT001`/`FBT002`
  directives made stale by the merge enabling FBT rules for tests in
  tool.ruff.lint.per-file-ignores (ruff RUF100).

Rebuilt on 2026-10-20 onto current origin/main (which includes the shfmt
and tombi preparation PRs canonical#505/canonical#506 and the ruff-pre-commit v0.17.1 bump)
and current starbase/main (through 1b92e7b, including the make -C docs
guidance from #636).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants