Repository navigation
chore(merge): update starbase (2026-10-20) - #507
Merged
lengau merged 198 commits intoOct 20, 2026
Merged
Conversation
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…1.11 (canonical#390) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This came from this discussion: https://github.com/canonical/snapcraft/pull/5529/files#r2121219994 Adds a `lint-uv-lockfile` make target that checks whether uv.lock is valid with the current pyproject.toml. It does not check whether the packages in that file are up to date. Signed-off-by: Alex Lowe <alex.lowe@canonical.com>
…1.12 (canonical#394) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…2.0 (canonical#407) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Alex Lowe <alex.lowe@canonical.com>
Co-authored-by: Imani Pelton <imani.pelton@canonical.com>
Using `--all-files` for pre-commit format affects more files than `make format` would otherwise do. Signed-off-by: Alex Lowe <alex.lowe@canonical.com>
Signed-off-by: Paul Mars <paul.mars@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
If python3-venv isn't installed, setuptools will fail.
* fix: install system packages during setup
…2.4 (canonical#412) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#420) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…2.8 (canonical#422) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
dangertoaster
commented
Oct 16, 2026
Contributor
Author
|
🤖 [BEEP BOOP, A BOT WROTE THIS COMMENT - kimi-k3, opencode] Provenance for files kept verbatim from this repository (no diff in this PR)The following files were involved in merge conflicts during the Starbase sync but resolved entirely in favor of the existing craft-cli content, so they do not appear in this PR's file list:
|
This was referenced Oct 16, 2026
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Imani Pelton <imani.pelton@canonical.com>
mr-cal
approved these changes
Oct 20, 2026
…on (#638) The scaffold comment invited child repos to write a fresh blurb for llms_txt_description, which drifts from the home page over time. Point authors at reusing the first sentence of docs/index.rst instead, matching the preference from the craft-parts review. Closes #603 Signed-off-by: Shahzeb Ali <126076773+Shahzeb-DataEngineer@users.noreply.github.com>
lengau
approved these changes
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).
dangertoaster
force-pushed
the
work/update-starbase-2026-10-16
branch
from
October 20, 2026 20:04
6bf6d29 to
8bf89c5
Compare
Contributor
Author
|
🤖 [BEEP BOOP, A BOT WROTE THIS COMMENT - kimi-k3, opencode] History rewritten and force-pushedThe merge commit was rebuilt from current heads (per the stale-PR refresh procedure — no layered merge commits):
Full validation passes on the rebuilt branch: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🤖 This message was generated by kimi-k3.
Summary
Merges
starbase/main(bdab610) into craft-cli, syncing Starbase-managed build tooling, CI workflows, and docs scaffolding.Starbase changes pulled in
actionlint,zizmor, andcopilot-setup-stepsconfigs; updatedcheck-renovate,policy,release-publish, and TICS workflowscommon.mkupdates (newlint-code,lint-uv-lockfile,lint-actions,format-shfmt/lint-shfmt,format-tombi/lint-tombitargets); ruff-pre-commit bumped to v0.17.0osv-scannerconfigurationConflict resolution
Per the file-ownership map (27 conflicts resolved): child-owned files kept (
CODEOWNERS,qa.yaml,uv.lock,README.md,CONTRIBUTING.md,tests/, docs pages with Starcraft→Craft CLI substitutions); starbase-owned files taken verbatim (common.mk, workflow files,.pre-commit-config.yamlwith the newer ruff pin,docs-sphinx-stackgroup); mixed-ownership files merged per section (pyproject.toml,Makefile,docs/conf.py, wordlist). Deleted per library-repo rules:docs/release-notes/,.github/README.md,tests/unit/starbase/, AGENTS templates, and the staledocs/.sphinx/leftover.Preparation PRs (must merge before this comes out of draft)
lint-shfmttarget fails ontests/integration/test_completion/expected_script.shuntil this lands)lint-tombitarget fails until this lands)Once both merge, this branch will be rebased onto
mainso those changes drop out of this diff.Validation
make docs— passes (all redirects report(good))lint-ruff,lint-ty,lint-codespell,lint-prettier,lint-shellcheck,lint-twine,lint-uv-lockfile,lint-actions— passlint-shfmt— fails ontests/integration/test_completion/expected_script.sh; fixed by test: make completion test robust to shfmt formatting #505lint-tombi— fails onpyproject.toml; fixed by style: format pyproject.toml with tombi #506lint-docs— fails becausesphinx-lintscans the localdocs/.venv; upstream issue filed: common.mk docs-lint: sphinx-lint scans docs/.venv starbase#635 (the merge addsdocs/.venv/to.gitignore; the sphinx-lint ignore needs a starbase-side fix)make test-fast— all pass excepttest_completion_output, fixed by test: make completion test robust to shfmt formatting #505Follow-up commits
fix: remove stale noqa directives and ignore docs/.venv— RUF100 cleanups required by the merge's ruff rule additions, plusdocs/.venvgitignore entry