vatsrahul1001 opened a new pull request, #67460:
URL: https://github.com/apache/airflow/pull/67460

   Manual backport of #67326 — auto-backport failed 
(https://github.com/apache/airflow/actions/runs/26391687063).
   
   ## Why auto-backport failed
   Conflicts in `pyproject.toml` and `uv.lock` around the 
`[tool.uv.exclude-newer-package]` cooldown overrides block:
   - `v3-2-test` still has the stale `uv = "12 hours"` override (REMOVE BY 
2026-05-01 — past).
   - Main had this cleaned up earlier in #67383.
   - The auto-bot couldn't reconcile.
   
   ## Resolution
   Resolved by dropping the stale `uv = "12 hours"` override (it's past its 
`REMOVE BY` date anyway) and keeping the new `starlette = "6 hours"` override 
that this PR adds. The drop effectively also brings #67383's cleanup into 
`v3-2-test`, so a separate backport of #67383 is **not** needed.
   
   ## What this PR ships
   - `starlette>=1.0.1` floor bump — Host-header parsing fix from 
https://github.com/Kludex/starlette/pull/3279.
   - `cadwyn>=6.1.1` floor bump — required because cadwyn 6.0.4 is incompatible 
with starlette 1.0.x (per cadwyn's own release notes: "Fix compatibility with 
starlette==1.0.0"). Without this, `test_access_api_contract` fails on 
LowestDeps with `TypeError: unhashable type: 'dict'` in jinja2 via cadwyn's 
swagger dashboard.
   - `starlette = "6 hours"` uv cooldown override so the floor bump can resolve 
before the global 4-day cooldown.
   - `scripts/ci/prek/upgrade_important_versions.py` enhancements (auto-honor & 
retire per-package overrides).
   
   ## Test plan
   - [X] Cherry-picked with `-x` trailer (preserves provenance reference to 
518eadfc39)
   - [X] Conflicts resolved (cooldown overrides only; uv.lock regenerated)
   - [X] Stale uv override dropped (covers #67383 implicitly)
   - [ ] Watch CI on v3-2-test


-- 
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]

Reply via email to