Merge starbase/main
Metadata
Current evaluation
Merged starbase/main into craft-cli, migrating build config to pyproject.toml, updating linters and docs, and removing legacy files. Branch protection disabled. Approved after conflict resolution and CI adjustments.
Suggested action: —
No scores available.
Issue body
This PR integrates craft-cli with the current "state of the art" implemented by Starbase. It's a huge changeset because it's a merge of two distinct repositories, but the idea is that future merges will be easier/less painful.
The general strategy was this: First I merged `starbase/main` into this branch, and for the conflicts I preferred starbase's version for most cases, unless the fix was very straightforward. This merge is commit 13c852fd4e5f6ec77ed145b6b253d38f16e5d769.
After that, I added commits to migrate craft-cli's way of doing things to starbase's. For example, the first commit after the merge removes `setup.py` and `setup.cfg` and adds the config to `pyproject.toml`. This migration was done manually and I inspected/tested the resulting wheel, etc. The next commits add fixes for the individual linters, coverage, and a bigger one for the docs. Then I removed the files that are no longer needed (like the Makefiles).
Hopefully, the task of reviewing per-commit starting at that merge (or the one right after it, since it's hard to review the merge) won't be too onerous because each commit is reasonably self-contained; if it is, tell me and I can see about opening multiple PRs.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged starbase/main into craft-cli, migrating build config to pyproject.toml, updating linters and docs, and removing legacy files. Branch protection disabled. Approved after conflict resolution and CI adjustments. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged starbase/main into craft-cli, migrating config to pyproject.toml, updating linters and docs, and removing obsolete files. Maintainer disabled automerge and branch protection to land the changeset, reviewed commit-by-commit without squashing. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #387 chore(merge): update starbase (2026-06-18) | craft-store | merged | Merged starbase/main updates, pulling in shared docs and build tooling. Conflicts were resolved by preserving child-repo workflows and CODEOWNERS while adopting full common.mk and AGENTS updates. Approved with all CI checks passing. | |
| #74 many: merge starbase/main | craft-archives | merged | Merged starbase/main into main after resolving conflicts and fixing linting issues. Approved by one reviewer with no coverage change. Maintainer specified a regular merge to preserve history. | |
| #409 chore(merge): update starbase (2026-07-22) | craft-store | merged | Merged after syncing starbase/main. Conflicts resolved by preserving child-repo uv.lock and pyproject.toml metadata while adopting shared Starbase tooling and workflows. All CI checks passed. | |
| #95 Merge starbase | craft-archives | closed | Merged into main. Integrated the starbase branch with ruff formatting, disabled mandatory fixture() checks, and applied manual fixes across 25 files. Coverage improved by 0.51% with 80% diff coverage. | |
| #92 Rebase on starbase | craft-grammar | merged | Merged after rebasing onto starbase. Approved by two reviewers with all CI checks passing across 35 files. TICS CI, docs, CODEOWNERS, and README updates were deferred to future PRs. | |
| #384 chore(merge): update starbase (2026-07-22) | imagecraft | closed | Merged starbase/main updates, resolving imagecraft child-repo conflicts and updating TICS project and PR template links. All CI checks passed prior to closure. | |
| #70 [EXPERIMENTAL] merge starbase/main | craft-archives | closed | Closed as an experiment to demonstrate merging starbase/main into craft-archives. Conflicts were intentionally preserved to highlight updates. The author closed the pull request to execute the merge properly in a follow-up process. | |
| #30 meta: update tooling from starbase | craft-application | merged | Merged into main following dual reviewer approval and passing CI. The update migrated project tooling to starbase, applied linting adjustments, and maintained 100% code coverage across 22 modified files. | |
| #353 docs: clarify the steps for merging starbase into a project | starbase | merged | Merged documentation update clarifying steps for merging starbase into a project. Approved by two reviewers, applying minimal changes (+2/-0 lines across one file). |