Skip to content

Merge 1.1-dev onto 1.1 - #1762

Merged
jpmckinney merged 50 commits into
1.1from
1.1-dev
Oct 9, 2026
Merged

jpmckinney merged 50 commits into
1.1from
1.1-dev

Conversation

@jpmckinney

Copy link
Copy Markdown
Member

No description provided.

jpmckinney and others added 30 commits October 8, 2026 11:56
…='/dev/null'>" (unknown source)

(cherry picked from commit bdcaaef)
…events set GITHUB_BASE_REF, needed by test_json.py)

(cherry picked from commit caf95de)
Bumps [bcomnes/netrc-creds](https://github.com/bcomnes/netrc-creds) from 2 to 3.
- [Release notes](https://github.com/bcomnes/netrc-creds/releases)
- [Changelog](https://github.com/bcomnes/netrc-creds/blob/master/CHANGELOG.md)
- [Commits](bcomnes/netrc-creds@v2...v3)

---
updated-dependencies:
- dependency-name: bcomnes/netrc-creds
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 55909da)
(cherry picked from commit b95e9cc)
(cherry picked from commit 987f40e)
for more information, see https://pre-commit.ci

(cherry picked from commit 2603687)
(cherry picked from commit b7aaa4b)
…nsion (changing OCDS validations is prohibited).

(cherry picked from commit be321ae)
(cherry picked from commit 311c9d2)
(cherry picked from commit 561a052)
(cherry picked from commit 08c8ad0)
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.6.9 → v0.8.6](astral-sh/ruff-pre-commit@v0.6.9...v0.8.6)
- [github.com/astral-sh/uv-pre-commit: 0.4.18 → 0.5.14](astral-sh/uv-pre-commit@0.4.18...0.5.14)

(cherry picked from commit 4a0a661)
(cherry picked from commit 05e9626)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.8.6 → v0.11.4](astral-sh/ruff-pre-commit@v0.8.6...v0.11.4)
- [github.com/astral-sh/uv-pre-commit: 0.5.14 → 0.6.12](astral-sh/uv-pre-commit@0.5.14...0.6.12)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* chore: Fix LOG015. build: Upgrade jinja.

* chore: Fix RUF100

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
(cherry picked from commit 8177608)
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.11.4 → v0.12.2](astral-sh/ruff-pre-commit@v0.11.4...v0.12.2)
- [github.com/astral-sh/uv-pre-commit: 0.6.12 → 0.7.19](astral-sh/uv-pre-commit@0.6.12...0.7.19)

(cherry picked from commit 68db851)
jpmckinney and others added 19 commits October 8, 2026 11:56
(cherry picked from commit c9e2591)
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.12.2 → v0.13.3](astral-sh/ruff-pre-commit@v0.12.2...v0.13.3)
- [github.com/astral-sh/uv-pre-commit: 0.7.19 → 0.8.23](astral-sh/uv-pre-commit@0.7.19...0.8.23)

(cherry picked from commit d8ba5b3)
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.13.3 → v0.14.10](astral-sh/ruff-pre-commit@v0.13.3...v0.14.10)
- [github.com/astral-sh/uv-pre-commit: 0.8.23 → 0.9.21](astral-sh/uv-pre-commit@0.8.23...0.9.21)

(cherry picked from commit b9a24d0)
(cherry picked from commit 08a31a0)
(cherry picked from commit 8df80cd)
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)

(cherry picked from commit 8357b17)
…s ruff configuration

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01W1t5wbKh4Tw84WeBDujJ2G
(cherry picked from commit 6811bf2)
Add sphinxcontrib-opendataservices to common requirements. Move standard_theme to uncompiled theme-requirements.txt, to track the branch instead of a commit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RmJqv44wXNcNkarFBjvyzT
build: Update to latest profile template (1.1-dev)
…pache's server-side includes

The theme reads a versions.json served next to the documentation root, which any host can serve, in place of the
`$BANNER` and version-options includes that Apache's mod_include resolves at request time. `versions_url` defaults
to it, so only the block goes.

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
The theme registers itself and its catalogs through the `sphinx.html_themes` entry point, and defaults the options
that every documentation repository set alike, ships the favicon, and adds the privacy notice to its footer.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UAeUtu5XGYmmSwtyjVU7gL
Render the banner and switchers in the theme, and drop the settings it now provides
@jpmckinney jpmckinney added this to the Minor: Build changes milestone Oct 9, 2026
Back-merges the commits made directly on 1.1 in #1733, so that the two branches share a merge base again.
Every conflict is in a file that 1.1-dev has since re-synced from the profile template, so each is
resolved in 1.1-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
jpmckinney merged commit 1e98b79 into 1.1 Oct 9, 2026
11 checks passed
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.

2 participants