← Back to issue list

chore: prepare for starbase merge

View original Github issue

Metadata

Project
craft-providers
Number
#786
Type
pull request
State
merged
Author
bepri
Labels
—
Created
Updated
Closed

Current evaluation

Merged as 1b046c0 (squashed): manual changes prepping craft-providers for the Starbase merge, deliberately keeping existing noqa comments. Follow-up PR #787 (808597b) brought in Starbase history.

Resolution: closed resolved

Reason: The PR was approved by 4 reviewers, all CI checks passed, and it landed squashed as commit 1b046c0 "chore: prepare for starbase merge (#786)". The author confirmed in the closing comment that the retained noqa comments were intentionally out of scope, deferred to #325/#326.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you followed the guidelines for contributing? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [ ] Have you successfully run `make lint && make test`? --- A bunch of manual changes in preparation for a Starbase merge. This PR is meant to be squashed, and then a second PR will be opened just for bringing in Starbase's history as a rebase. Once this lands, I'll create an issue for removing the unnecessary `noqa` comments, but for now I kept them to keep the complexity of this PR down. Chances are, #326 will be a prerequisite to doing that anyways. Note for the TAs: Just the top-level docs need to be reviewed on this :)

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged as 1b046c0 (squashed): manual changes prepping craft-providers for the Starbase merge, deliberately keeping existing noqa comments. Follow-up PR #787 (808597b) brought in Starbase history.
qwen/qwen3.6-35b-a3b — closed resolved Merged PR preparing for Starbase merge with manual changes. Meant to be squashed before a follow-up PR brings in Starbase's history as a rebase.

Update history

Date Change
created

Related work

  • Related To: craft-providers#787 (confidence 97%)

    The follow-up PR promised in #786, merged as 808597b "chore: bring in the latest starbase", completing the Starbase rebase.

  • Blocked By: craft-providers#326 (confidence 85%)

    Maintainer called #326 a prerequisite for cleaning up the noqa comments; #326 was later superseded by the move to ty in #885.

  • Related To: craft-providers#325 (confidence 78%)

    Ruff ignore-cleanup issue cited alongside #326 as the source of the noqa noise left in place by this PR; closed later as stale.

Related issues

Issue Project State Summary Similarity
#1253 chore: prepare for a starbase merge craft-parts merged Squash-merged as 88685a04 (chore: prepare for a starbase merge), a docs/CI style-only prep change (trailing-whitespace, line-too-long, many noqa additions) preceding the real Starbase history merge.
88%
#340 chore: prepare for starbase merge craft-cli merged Merged in commit e05899f as PR #340, landing Starbase preparation fixes; the planned follow-up Starbase merge landed in #787.
88%
#1028 chore(merge): update starbase (2026-10-19) craft-providers merged Merged #1028 updates craft-providers to starbase/main@3c895c5, incorporating dependency bumps, CI workflow updates, and build tooling changes while preserving child repository configurations.
86%
#785 chore: prepare for starbase merge craft-providers closed Closed unmerged to rename the source branch; the same Starbase preparation landed through PR #786 as commit 1b046c0, followed by merged PR #787 to rebase onto Starbase.
85%
#787 chore: rebase onto starbase craft-providers merged Merged PR #787 as commit 808597b, rebasing craft-providers onto Starbase while reconciling documentation, tests, the uv lockfile, and the docs workflow.
84%
#973 chore: merge the latest Starbase craft-providers merged PR #973 merged as commit aa50a03, syncing canonical/starbase/main into craft-providers: 33 files, +1881/-316, approved by 2 reviewers; macos-14 large slow-test failure overridden.
83%
#507 chore(merge): update starbase (2026-10-20) craft-cli merged Merged starbase/main sync updating CI workflows, build tooling, and docs scaffolding. Resolved 27 file conflicts, incorporated prep PRs #505 and #506, and squashed follow-up fixes into a single merge commit.
83%
#387 chore(merge): update starbase (2026-06-18) craft-store merged Merged PR #387 in commit 5c83549, updating Starbase docs/build tooling while preserving craft-store-specific CI and CODEOWNERS files.
83%
#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.
83%
#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.
82%