vatsrahul1001 opened a new pull request, #67466:
URL: https://github.com/apache/airflow/pull/67466
Manual backport of #67435 — auto-backport failed (conflict in
`devel-common/src/docs/utils/conf_constants.py`).
## Why auto-backport failed
The PR's diff added two sphinx extensions to `SUPPORTED_SPHINX_EXTENSIONS`:
- `sphinxcontrib.mermaid` — needed for the new mermaid diagrams
- `common_compat_alias` — added on main by #67083 ("Docs: Make
common.compat.sdk re-exports clickable")
`#67083` has not been backported to `v3-2-test`, so `common_compat_alias.py`
doesn't exist there. Adding the extension would break the docs build on
v3-2-test with an ImportError.
## Resolution
Kept only `sphinxcontrib.mermaid` in the extensions list — the cherry-picked
docs themselves don't reference `common.compat.sdk`, so dropping
`common_compat_alias` is safe. Everything else applied cleanly.
`uv.lock` change is small (~43 lines, purely additive
`sphinxcontrib-mermaid` entries) — should not trigger the MySQL
`test_async_session` transitive-dep issue currently being investigated by
@amoghrajesh on #67460.
## Test plan
- [X] Cherry-picked with `-x` trailer (preserves provenance reference to
0a506b18b9)
- [X] Conflict resolved (only `common_compat_alias` extension dropped — not
needed on v3-2-test)
- [ ] Watch CI on v3-2-test (especially docs build)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
