← Back to issue list

chore(merge): update starbase (2026-10-23)

View original Github issue

Metadata

Project
craft-archives
Number
#268
Type
pull request
State
merged
Author
LoweRAM
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Syncs starbase/main into main, updating dependencies, removing obsolete mypy/pyright targets, and resolving merge conflicts. Merged successfully.

Resolution: closed resolved

Reason: The pull request was merged into main after successfully syncing starbase template updates, resolving file conflicts, and passing all CI checks.

Evaluated by: mr-cal-bot

No scores available.

Issue body

Merges `starbase/main` (`2f812f6`) into `main` (`cd53a29`) and syncs the Starbase-managed files for this library repository. ## Starbase changes pulled in - **TOML formatting via tombi**: new `format-tombi`/`lint-tombi` targets in `common.mk`, wired into `make format`/`make lint-code`, plus an `[*.toml]` `indent_size = 2` section in `.editorconfig`. - **Dependency and tool updates**: `ruff-pre-commit` v0.16.4 → v0.17.0, `dorny/paths-filter` v4.0.2 → v4.0.3, `astral-sh/setup-uv` v9.0.0 → v10.3.0, `actions/setup-node` v7.0.0 → v7.1.0, and a `starlette>=1.0.1` constraint. - **Linting & typing modernization**: removed obsolete `mypy` and `pyright` targets and installation rules from `common.mk` (matching child repository). - **CI workflows**: a new `copilot-setup-steps.yaml` workflow with cached tool preinstalls, the `spread-enabled` actionlint label, and a collapsible log group around `lint-uv-lockfile`. - **Release workflow**: export `GH_REPO` for `gh release create`, updated runner sizes, artifact upload/download actions, plus a note about excluding the PyPI job from starbase-originated merges. - **Docs guidance**: updated instructions in `docs/conf.py` regarding `llms_txt_description` derivation, updated docs make command guidance in `AGENTS.md`, and clean docs-help output in `common.mk`. ## Conflicts resolved (5 files) | File | Resolution | | --- | --- | | `.pre-commit-config.yaml` | Took starbase in full. ruff v0.17.0 is newer than the child's v0.16.4; every other hook pin matches or was already newer, so nothing regressed. | | `Makefile` | Kept the child's `lint-code` target (no `lint-mypy`/`lint-pyright`, dropped in #253) and added starbase's `lint-tombi`. `format-tombi` merged cleanly. | | `docs/conf.py` | Kept child values; incorporated new Starbase comments for `llms_txt_description`. | | `docs/explanation/documentation.rst` | Kept the child version — repository-owned documentation page. | | `pyproject.toml` | Kept child-owned values; took starbase's structure. Details below. | `pyproject.toml` resolution in detail: - `[project]` block, `[build-system]`, and all `[dependency-groups]` entries kept from the child (including no `[project.scripts]` and no `mypy` in `types`). - `[tool.mypy]` and `[tool.pyright]` stay deleted, per #253 (child-owned). - `[tool.setuptools_scm]` taken from starbase with `write_to = "craft_archives/_version.py"`. - `tool.uv.constraint-dependencies` merged keeping the higher version on each side (`httplib2>=0.32.0`, `oauthlib>=4.0.0`, `setuptools>=83.0.0`, `urllib3>=2.8.0`) and adding `starlette>=1.0.1`; `uv.lock` records it. - `docs-sphinx-stack` group taken verbatim from starbase, including which entries are commented out. ## Custom changes - `Makefile`: the stale `# COVERAGE_SOURCE="starcraft"` scaffolding comment now names `craft_archives`. - `uv.lock`: only the `starlette` constraint line was added in follow-up commit, keeping the lockfile `revision` at 3 to avoid unrelated churn from a newer local uv. ## Placeholder disposition `common.mk`'s header and the `release-publish.yaml` notes are legitimate Starbase ownership/attribution comments, and the `Starcraft` mentions in `docs/README.md` are intentionally Vale-suppressed by starbase. Nothing else in the diff references the template names. The library deletions stay in place: `docs/release-notes/`, `.github/README.md`, the `starcraft/` scaffold package, `AGENTS.lib.md`, `AGENTS.app.md`, and `tests/unit/starbase/test_init.py` remain deleted, and `AGENTS.md` is updated with docs make command instructions. ## Validation - `make format` — clean - `make lint` — clean (all linters passed, including ruff, ty, codespell, prettier, tombi, sphinx-lint, linkcheck, twine, actionlint) - `make docs` — build succeeded - `make lint-docs` — spelling, woke, vale (0 errors, 0 warnings), and linkcheck clean - `make test-fast` — 256 passed, 1 skipped ## Pending preparation PRs - #258 (`fix: annotate _temporary_home_dir as a generator`) — merged into `main`. - #260 (`build(deps): raise oauthlib constraint to 4.0.0`) — merged into `main`. - #269 (`test: mark is_on_old_releases tests as slow`) — open and approved; prevents test suite timeouts on archive network glitches.

Evaluation history

Date Model Scores Action Summary
qwen/qwen3.6-35b-a3b — closed resolved Syncs starbase/main into main, updating dependencies, removing obsolete mypy/pyright targets, and resolving merge conflicts. Merged successfully.
qwen/qwen3.6-35b-a3b
Impact: 25
Quick Win: 9
Complexity: 30
Confidence: 75
Actionability: 50
needs review Routine starbase template merge with dependency bumps, linting modernization, and CI changes. Approved by 3 reviewers with 0 unresolved comments, but has one failing CI check (lint / files).
qwen/qwen3.6-35b-a3b
Impact: 20
Quick Win: 6
Complexity: 30
Confidence: 75
Actionability: 40
needs review Routine starbase template update merge with dependency bumps, linting modernization, and CI workflow changes. Approved by 2 reviewers but has 8 unresolved review comments and one failing CI check (lint / files).
qwen/qwen3.6-35b-a3b
Impact: 15
Quick Win: 10
Complexity: 20
Confidence: 75
Actionability: 80
needs review Routine Starbase sync updating dependencies, CI workflows, and build tooling. All validation passed, CI green, awaiting maintainer review.
qwen/qwen3.6-35b-a3b
Impact: 5
Quick Win: 3
Complexity: 15
Confidence: 85
Actionability: 70
needs review Routine starbase template sync bringing TOML formatting, dependency updates, and CI workflow changes. All CI passing except two pre-existing failures (#258, #260) the author will rebase onto.

Update history

Date Change
merged
updated
updated
updated
updated
updated
updated
updated
updated
updated
created

Related work

Related issues

Issue Project State Summary Similarity
#449 chore(merge): update starbase (2026-09-28) imagecraft merged Merged in #449 via commit 545f51a, rebuilding the Starbase sync on current main and starbase/main and folding dependency, lint, docs, and CI adjustments into one merge.
90%
#1398 chore(merge): update starbase (2026-10-16) rockcraft merged Merged PR #1398 syncing starbase/main into main, updating build system, workflows, docs tooling, and dependencies, with conflict resolutions and RTD build fixes.
90%
#493 chore(merge): update starbase (2026-10-08) craft-cli closed Merged routine starbase/main sync updating build system, CI workflows, documentation tooling, and dependencies, with resolved merge conflicts.
90%
#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.
88%
#449 chore(merge): update starbase (2026-10-20) craft-store merged Merged routine Starbase sync updating dependencies, tooling configs, and resolving merge conflicts. All CI checks and validation passed.
88%
#1019 chore(merge): update starbase (2026-10-09) craft-providers closed Merged into main, updating starbase to a310931. Includes build tooling, CI workflow, and dependency updates. Conflict resolutions applied and validation passed.
88%
#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.
87%
#433 chore(merge): update starbase (2026-10-08) craft-store closed Merged routine starbase dependency and tooling updates with conflict resolutions applied to align with starbase/main.
87%
#865 chore(merge): starbase into main rockcraft merged Merged starbase into main via PR #865 (commit 93f70f62); the reported pyright failure was confirmed to pre-exist on clean main.
87%
#1728 chore(merge): update starbase (2026-10-01) craft-parts merged Merged #1728 into main as d2be519e, syncing starbase/main's build, CI, docs tooling, Ruff 0.16, Sphinx Stack, and AGENTS.md updates.
87%