Skip to content

Bump uv to 0.11.8 to adopt uv.lock-conflict fix#66042

Merged
potiuk merged 1 commit intoapache:mainfrom
potiuk:bump-uv-0.11.8
Apr 28, 2026
Merged

Bump uv to 0.11.8 to adopt uv.lock-conflict fix#66042
potiuk merged 1 commit intoapache:mainfrom
potiuk:bump-uv-0.11.8

Conversation

@potiuk
Copy link
Copy Markdown
Member

@potiuk potiuk commented Apr 28, 2026 •
edited by eladkal
Loading

Summary

  • Bump [tool.uv] required-version floor 0.11.7 → 0.11.8 to pick up
    astral-sh/uv#19022, which
    solve astral-sh/uv#18708 —
    relative exclude-newer cooldowns no longer write a live timestamp into
    uv.lock that two concurrent branches collide on.
  • Override uv = "12 hours" in [tool.uv.exclude-newer-package] and
    [tool.uv.pip.exclude-newer-package] so the freshly-published 0.11.8 isn't
    gated by the project-wide 4-day cooldown. Marked REMOVE BY 2026-05-01
    in both call sites — once 0.11.8 is older than the global window the
    override is redundant and should be deleted.
  • Sync AIRFLOW_UV_VERSION across Dockerfile, Dockerfile.ci, the breeze
    constants, and the image-args doc table.
  • The two # sync-uv-min-version-tagged constants
    (_PROVIDERS_DOCKER_UV_MIN_VERSION, _MIN_UV) were rewritten
    automatically by the matching prek hook.
  • uv.lock confirms the upstream fix is engaged — exclude-newer reads as
    the no-op 0001-01-01T00:00:00Z placeholder.

Test plan

  • Local uv lock succeeds with the new floor + cooldown override.
  • prek run --from-ref main --stage pre-commit passes (incl. the
    sync-uv-min-version-markers hook).
Was generative AI tooling used to co-author this PR?
  • Yes — Claude Code (Opus 4.7)

Generated-by: Claude Code (Opus 4.7) following the guidelines

@boring-cyborg boring-cyborg Bot added area:dev-tools area:production-image Production image improvements and fixes backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch labels Apr 28, 2026
@potiuk potiuk added _eol_backport-to-v2-11-test Mark PR with this label to backport to v2-11-test branch backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch backport-to-airflow-ctl-v0-1-test Backport to airflow-ctl/v0-1-test and removed _eol_backport-to-v2-11-test Mark PR with this label to backport to v2-11-test branch labels Apr 28, 2026
@potiuk
Bump uv floor to 0.11.8, override cooldown for uv
8adb5ae 
Pins `[tool.uv] required-version` (and the matching marker-tagged
constants in breeze) to 0.11.8 across the root and the three workspace
members that carried their own (stale) floor (`airflow-core`,
`airflow-ctl`, `dev/mypy` — all previously `>=0.6.3`). The bump picks
up the timestamp-elision fix from astral-sh/uv#19022 (closes
astral-sh/uv#18708 — relative `exclude-newer` no longer writes a
churning timestamp into uv.lock that two branches collide on).

Drops uv's per-package cooldown to "12 hours" in both
[tool.uv.exclude-newer-package] and [tool.uv.pip.exclude-newer-package];
without the override the project-wide 4-day window blocks a
freshly-released uv from being adopted as the floor. The override is
flagged "REMOVE BY 2026-05-01" — once 0.11.8 is older than the global
4-day cooldown the override is redundant.

Bumps AIRFLOW_UV_VERSION across Dockerfiles, breeze constants, and
the image-args doc to match. The `# sync-uv-min-version`-tagged test
fixtures were auto-rewritten by the prek hook of the same name.

uv.lock confirms the upstream fix is engaged: `exclude-newer` reads
as the no-op `0001-01-01T00:00:00Z` placeholder.
@potiuk potiuk merged commit dbfc27d into apache:main Apr 28, 2026
288 checks passed
@potiuk potiuk deleted the bump-uv-0.11.8 branch April 28, 2026 21:31
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 28, 2026

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
❌ v3-2-test Commit Link

You can attempt to backport this manually by running:

cherry_picker dbfc27d v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 28, 2026

Backport failed to create: airflow-ctl-v0-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
❌ airflow-ctl-v0-1-test Commit Link

You can attempt to backport this manually by running:

cherry_picker dbfc27d airflow-ctl-v0-1-test

This should apply the commit to the airflow-ctl-v0-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 28, 2026

Backport failed to create: chart/v1-2x-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
❌ chart/v1-2x-test Commit Link

You can attempt to backport this manually by running:

cherry_picker dbfc27d chart/v1-2x-test

This should apply the commit to the chart/v1-2x-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

This was referenced Apr 28, 2026
Merged
Merged
Merged
potiuk added a commit that referenced this pull request Apr 28, 2026
@potiuk
Bump uv floor to 0.11.8, override cooldown for uv (#66042) (#66054)
5a314bf 
Pins `[tool.uv] required-version` (and the matching marker-tagged
constants in breeze) to 0.11.8 across the root and the three workspace
members that carried their own (stale) floor (`airflow-core`,
`airflow-ctl`, `dev/mypy` — all previously `>=0.6.3`). The bump picks
up the timestamp-elision fix from astral-sh/uv#19022 (closes
astral-sh/uv#18708 — relative `exclude-newer` no longer writes a
churning timestamp into uv.lock that two branches collide on).

Drops uv's per-package cooldown to "12 hours" in both
[tool.uv.exclude-newer-package] and [tool.uv.pip.exclude-newer-package];
without the override the project-wide 4-day window blocks a
freshly-released uv from being adopted as the floor. The override is
flagged "REMOVE BY 2026-05-01" — once 0.11.8 is older than the global
4-day cooldown the override is redundant.

Bumps AIRFLOW_UV_VERSION across Dockerfiles, breeze constants, and
the image-args doc to match. The `# sync-uv-min-version`-tagged test
fixtures were auto-rewritten by the prek hook of the same name.

uv.lock confirms the upstream fix is engaged: `exclude-newer` reads
as the no-op `0001-01-01T00:00:00Z` placeholder.
(cherry picked from commit dbfc27d)
potiuk added a commit that referenced this pull request Apr 28, 2026
@potiuk
Bump uv floor to 0.11.8, override cooldown for uv (#66042) (#66056)
644c38a 
Pins `[tool.uv] required-version` (and the matching marker-tagged
constants in breeze) to 0.11.8 across the root and the three workspace
members that carried their own (stale) floor (`airflow-core`,
`airflow-ctl`, `dev/mypy` — all previously `>=0.6.3`). The bump picks
up the timestamp-elision fix from astral-sh/uv#19022 (closes
astral-sh/uv#18708 — relative `exclude-newer` no longer writes a
churning timestamp into uv.lock that two branches collide on).

Drops uv's per-package cooldown to "12 hours" in both
[tool.uv.exclude-newer-package] and [tool.uv.pip.exclude-newer-package];
without the override the project-wide 4-day window blocks a
freshly-released uv from being adopted as the floor. The override is
flagged "REMOVE BY 2026-05-01" — once 0.11.8 is older than the global
4-day cooldown the override is redundant.

Bumps AIRFLOW_UV_VERSION across Dockerfiles, breeze constants, and
the image-args doc to match. The `# sync-uv-min-version`-tagged test
fixtures were auto-rewritten by the prek hook of the same name.

uv.lock confirms the upstream fix is engaged: `exclude-newer` reads
as the no-op `0001-01-01T00:00:00Z` placeholder.
(cherry picked from commit dbfc27d)
potiuk added a commit that referenced this pull request Apr 28, 2026
@potiuk
Bump uv floor to 0.11.8, override cooldown for uv (#66042) (#66057)
cb1426c 
Pins `[tool.uv] required-version` (and the matching marker-tagged
constants in breeze) to 0.11.8 across the root and the three workspace
members that carried their own (stale) floor (`airflow-core`,
`airflow-ctl`, `dev/mypy` — all previously `>=0.6.3`). The bump picks
up the timestamp-elision fix from astral-sh/uv#19022 (closes
astral-sh/uv#18708 — relative `exclude-newer` no longer writes a
churning timestamp into uv.lock that two branches collide on).

Drops uv's per-package cooldown to "12 hours" in both
[tool.uv.exclude-newer-package] and [tool.uv.pip.exclude-newer-package];
without the override the project-wide 4-day window blocks a
freshly-released uv from being adopted as the floor. The override is
flagged "REMOVE BY 2026-05-01" — once 0.11.8 is older than the global
4-day cooldown the override is redundant.

Bumps AIRFLOW_UV_VERSION across Dockerfiles, breeze constants, and
the image-args doc to match. The `# sync-uv-min-version`-tagged test
fixtures were auto-rewritten by the prek hook of the same name.

uv.lock confirms the upstream fix is engaged: `exclude-newer` reads
as the no-op `0001-01-01T00:00:00Z` placeholder.
(cherry picked from commit dbfc27d)
@potiuk potiuk mentioned this pull request Apr 29, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bugraoz93 bugraoz93 bugraoz93 approved these changes

@hussein-awala hussein-awala hussein-awala approved these changes

@eladkal eladkal eladkal approved these changes

@shahar1 shahar1 shahar1 approved these changes

@ashb ashb Awaiting requested review from ashb ashb is a code owner

@gopidesupavan gopidesupavan Awaiting requested review from gopidesupavan gopidesupavan is a code owner

@amoghrajesh amoghrajesh Awaiting requested review from amoghrajesh amoghrajesh is a code owner

@jscheffl jscheffl Awaiting requested review from jscheffl jscheffl is a code owner

@jason810496 jason810496 Awaiting requested review from jason810496 jason810496 is a code owner

@jedcunningham jedcunningham Awaiting requested review from jedcunningham jedcunningham is a code owner

@ephraimbuddy ephraimbuddy Awaiting requested review from ephraimbuddy ephraimbuddy is a code owner

@choo121600 choo121600 Awaiting requested review from choo121600 choo121600 is a code owner

@vatsrahul1001 vatsrahul1001 Awaiting requested review from vatsrahul1001 vatsrahul1001 is a code owner

@dheerajturaga dheerajturaga Awaiting requested review from dheerajturaga dheerajturaga is a code owner

Assignees

No one assigned

Labels

area:dev-tools area:production-image Production image improvements and fixes backport-to-airflow-ctl-v0-1-test Backport to airflow-ctl/v0-1-test backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@potiuk @bugraoz93 @hussein-awala @eladkal @shahar1