← Back to issue list

Merge starbase/main

View original Github issue

Metadata

Project
craft-cli
Number
#145
Type
pull request
State
merged
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

Merged Starbase into craft-cli: build config moved to pyproject.toml (setup.py/cfg and Makefiles removed), linters, coverage and docs updated. Landed as PR #145, approved and merged.

Resolution: closed resolved

Reason: The PR was approved and merged into craft-cli main, with the starbase/main merge at commit 13c852f followed by follow-up commits (e.g. 4e6a7c3 'build: consolidate into pyproject.toml', b7f7e16 'many: cleanups from the starbase merge'); a later preparation PR #340 (e05899f) built on this.

Evaluated by: mr-cal-bot

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
stealth/space-bunny-alpha — closed resolved Merged Starbase into craft-cli: build config moved to pyproject.toml (setup.py/cfg and Makefiles removed), linters, coverage and docs updated. Landed as PR #145, approved and merged.
stealth/space-bunny-alpha — closed resolved Merged Starbase into craft-cli via #145 (f6350bf), moving build configuration to pyproject.toml, updating linters, coverage and docs, and removing obsolete files.
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.

Update history

No update history recorded yet.

Related work

  • Related To: craft-cli#340 (confidence 75%)

    Follow-up 'chore: prepare for starbase merge' merged as e05899f, touching the same files cleaned up here

Related issues

Issue Project State Summary Similarity
#324 starbase: merge 'starbase/main' craft-providers merged Merged starbase/main into craft-providers without squashing. PR #324 landed via merge commit 7aacbfd (PR tip f06bf01), changing 9 files.
79%
#5 base: Align to latest starbase standards craft-archives merged PR merged as commit c9e2971: pulled updated config from starbase into craft-archives, adding tox Sphinx/docs setup (no doc files yet) plus lint fixes; later synced again via 071d217 and 0872a9c.
77%
#74 many: merge starbase/main craft-archives merged Merged starbase/main via commit 071d217, resolving conflicts in favor of starbase; follow-up lint fixes produced merged PR head b23d3b3.
77%
#92 Rebase on starbase craft-grammar merged Merged PR #92 rebased craft-grammar on Starbase as commit 9594141 after two approvals and with all CI passing; selected TICS, docs, CODEOWNERS and README changes were deferred.
77%
#225 chore(merge): update starbase (2026-10-16) craft-grammar merged Merged PR #225 syncing starbase/main into craft-grammar, updating CI, linting, and docs tooling, and resolving merge conflicts.
76%
#95 Merge starbase craft-archives closed Merged Starbase into main via PR #95, including Ruff formatting, relaxed fixture() enforcement, and manual fixes.
76%
#213 chore(merge): update starbase (2026-10-19) debcraft merged Merged starbase/main updates into debcraft/main, syncing docs tooling, workflows, pre-commit hooks, and templates. Resolved conflicts and passed all CI checks.
75%
#182 chore(merge): update starbase craft-grammar merged Merged to main as commit 23557e7 (CRAFT-4762), pulling Starbase into Craft Grammar. Starbase's diff was favoured over the outdated local config; only type-check (ty) fixes were hand-written, plus docs review notes.
74%
#18 chore: merge the latest starbase craft-artifacts merged Merged the latest Starbase into craft-artifacts via PR #18 (commit 9196317), updating 30 files after approval by two reviewers.
74%
#22 Starbase migration craft-grammar merged Merged the Starbase migration into craft-grammar via PR #22 at commit 3a6f6c4, changing 48 files (+1,692/-669) after two approvals.
74%