pierrejeambrun opened a new pull request, #76306: URL: https://github.com/apache/airflow/pull/76306
Follow-up to #76012, stacked on it: until #76012 merges this diff also shows its two commits. Once it lands I'll rebase onto `main` so only the last commit remains. The Variable restore has a single caller, so keeping it inline in `update_orm_from_pydantic` mirrors the Connection update it was modelled on. #76012 made `merge` walk nested values at any depth, as `redact` has done since #73793. The `depth` and `max_depth` arguments threaded through `_merge` no longer bound anything and only suggested a cutoff that doesn't exist, so they go. The public `merge(max_depth=...)` keeps its signature for compatibility, and its docstring now says the argument is ignored. No behaviour change. --- ##### Was generative AI tooling used to co-author this PR? - [X] Yes — Claude Code (Opus 5.5) Generated-by: Claude Code (Opus 5.5) following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions) -- 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]
