Skip to content

Merge 0.9-dev into 0.9 - #527

Closed
jpmckinney wants to merge 24 commits into
0.9from
0.9-dev
Closed

jpmckinney wants to merge 24 commits into
0.9from
0.9-dev

Conversation

@jpmckinney

Copy link
Copy Markdown
Member

Brings 0.9 up to date with 0.9-dev, so that the live documentation is rebuilt against the current theme.

This is the merge that matters, not a rebuild: 0.9 still sets html_theme_path, while theme-requirements.txt tracks the theme's branch unpinned. Rebuilding 0.9 as it stands would find the theme by directory, which skips its setup(), and the build would emit neither theme.js nor switchers.js — a broken sidebar and no banner or switcher. build: Let the theme register itself, instead of setting its paths is what removes that, and it is on this branch.

What the merge carries:

  • the theme is found through its sphinx.html_themes entry point, so its scripts and message catalogs are registered
  • the settings the theme now provides are dropped, along with the favicon
  • standard_theme moves to an uncompiled theme-requirements.txt, so pip-compile stops resolving the branch to a commit
  • workflow_dispatch, so this branch can be rebuilt from the Actions tab without a commit

Rebuilding also replaces the switchers.js deployed on 2026-09-24, which predates the theme leaving out a version switcher that holds a single option. /infrastructure/latest/ currently shows a one-option version dropdown; after this it shows none.

The merge commit

0.9 carried fourteen commits that were made on it directly and never merged back, so this was conflicting in four files. git log --cherry-pick --left-only origin/0.9...origin/0.9-dev is empty — every one of them has an equivalent patch on 0.9-dev, which has since re-synced the same files from the profile template. So Merge branch '0.9' into 0.9-dev resolves all four in 0.9-dev's favour, and its tree is byte-identical to 0.9-dev before it: it changes no file, and it stops the conflict recurring on every release by giving the branches a shared merge base again.

🤖 Generated with Claude Code

neelima-j and others added 24 commits April 27, 2026 13:07
…-example

example.json: Fix logical error in lifecyle cost
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.15.9 → v0.15.20](astral-sh/ruff-pre-commit@v0.15.9...v0.15.20)
- [github.com/astral-sh/uv-pre-commit: 0.11.3 → 0.11.26](astral-sh/uv-pre-commit@0.11.3...0.11.26)
…pache's server-side includes

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UAeUtu5XGYmmSwtyjVU7gL
The option also emits relative links as the no-JavaScript fallback, in place of a form posted to
`{root}/{version}/switcher`.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UAeUtu5XGYmmSwtyjVU7gL
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.15.20 → v0.16.10](astral-sh/ruff-pre-commit@v0.15.20...v0.16.10)
- [github.com/astral-sh/uv-pre-commit: 0.11.26 → 0.12.23](astral-sh/uv-pre-commit@0.11.26...0.12.23)
- [github.com/biomejs/pre-commit: v2.5.2 → v2.5.15](biomejs/pre-commit@v2.5.2...v2.5.15)
…rack the branch instead of a commit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RmJqv44wXNcNkarFBjvyzT
The theme registers itself and its message catalogs through the `sphinx.html_themes` entry point, so its catalogs
are found: `get_html_theme_path()` returns site-packages, where they were never installed, and every theme string
fell back to English.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UAeUtu5XGYmmSwtyjVU7gL
standard_theme defaults analytics_id, copyright, license_name, license_url, versions_url and display_version, and
provides the favicon.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RmJqv44wXNcNkarFBjvyzT
…a new theme

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UAeUtu5XGYmmSwtyjVU7gL
Back-merges the commits made directly on 0.9, so that the two branches share a merge base again. Every
conflict is in a file that 0.9-dev has since re-synced from the profile template, so each is resolved in
0.9-dev's favour and the tree is unchanged.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UAeUtu5XGYmmSwtyjVU7gL
@jpmckinney

Copy link
Copy Markdown
Member Author

Superseded by #528, which cherry-picks the same six build commits onto 0.9 instead of merging 0.9-dev wholesale, so that example.json and changelog.md stay out of the release.

🤖 Generated with Claude Code

@jpmckinney jpmckinney closed this Oct 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants