Bump uv floor to 0.11.8, override cooldown for uv

potiuk · potiuk · commit 696aacd55697 · 2026-04-28T20:43:39.000+02:00
Pins `[tool.uv] required-version` (and the matching marker-tagged constants in breeze) to 0.11.8 to pick 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.
diff --git a/Dockerfile b/Dockerfile
@@ -73,7 +73,7 @@ ARG PYTHON_LTO="true"
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=26.0.1
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.11.7
+ARG AIRFLOW_UV_VERSION=0.11.8
 ARG AIRFLOW_USE_UV="false"
 ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
 ARG AIRFLOW_IMAGE_README_URL="https://raw.githubusercontent.com/apache/airflow/main/docs/docker-stack/README.md"
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1825,7 +1825,7 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=26.0.1
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.11.7
+ARG AIRFLOW_UV_VERSION=0.11.8
 ARG AIRFLOW_PREK_VERSION="0.3.10"
 
 # UV_LINK_MODE=copy is needed since we are using cache mounted from the host
diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md
@@ -443,7 +443,7 @@ can be used for CI images:
 | `ADDITIONAL_DEV_APT_DEPS`         |                             | Additional apt dev dependencies installed in the first part of the image                                          |
 | `ADDITIONAL_DEV_APT_ENV`          |                             | Additional env variables defined when installing dev deps                                                         |
 | `AIRFLOW_PIP_VERSION`             | `26.0.1`                    | `pip` version used.                                                                                               |
-| `AIRFLOW_UV_VERSION`              | `0.11.7`                     | `uv` version used.                                                                                                |
+| `AIRFLOW_UV_VERSION`              | `0.11.8`                     | `uv` version used.                                                                                                |
 | `AIRFLOW_PREK_VERSION`            | `0.3.10`                    | `prek` version used.                                                                                              |
 | `AIRFLOW_USE_UV`                  | `true`                      | Whether to use UV for installation.                                                                               |
 | `PIP_PROGRESS_BAR`                | `on`                        | Progress bar for PIP installation                                                                                 |
diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
@@ -264,7 +264,7 @@ class VersionedFile(NamedTuple):
 
 
 AIRFLOW_PIP_VERSION = "26.0.1"
-AIRFLOW_UV_VERSION = "0.11.7"
+AIRFLOW_UV_VERSION = "0.11.8"
 AIRFLOW_USE_UV = False
 GITPYTHON_VERSION = "3.1.47"
 RICH_VERSION = "15.0.0"
diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -241,7 +241,7 @@
 ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb"]
 
 PIP_VERSION = "26.0.1"
-UV_VERSION = "0.11.7"
+UV_VERSION = "0.11.8"
 
 # packages that providers docs
 REGULAR_DOC_PACKAGES = [
diff --git a/dev/breeze/src/airflow_breeze/utils/check_release_files.py b/dev/breeze/src/airflow_breeze/utils/check_release_files.py
@@ -25,7 +25,7 @@
 # Must satisfy the `[tool.uv] required-version` floor in the root pyproject.toml
 # that gets COPY'd into the PMC image. Kept in lockstep with that floor by the
 # `sync-uv-min-version-markers` prek hook.
-_PROVIDERS_DOCKER_UV_MIN_VERSION = "0.11.7"  # sync-uv-min-version
+_PROVIDERS_DOCKER_UV_MIN_VERSION = "0.11.8"  # sync-uv-min-version
 
 PROVIDERS_DOCKER = f"""\
 FROM ghcr.io/apache/airflow/main/ci/python3.10
diff --git a/dev/breeze/tests/test_environment_check.py b/dev/breeze/tests/test_environment_check.py
@@ -27,7 +27,7 @@
 # `# sync-uv-min-version` marker is auto-rewritten when required-version is bumped
 # manually. Tests that exercise the success path set both the mocked floor AND the
 # mocked "actual uv" to this value so the ok-case keeps passing after a bump.
-_MIN_UV = "0.11.7"  # sync-uv-min-version
+_MIN_UV = "0.11.8"  # sync-uv-min-version
 
 
 @mock.patch("airflow_breeze.utils.environment_check._read_required_uv_version")
diff --git a/pyproject.toml b/pyproject.toml
@@ -551,7 +551,7 @@ apache-airflow = "airflow.__main__:main"
     "apache-airflow-providers-amazon[s3fs]",
 ]
 "uv" = [
-    "uv>=0.11.7",
+    "uv>=0.11.8",
 ]
 
 [project.urls]
@@ -1360,7 +1360,7 @@ leveldb = [
 # with AIRFLOW_UV_VERSION would force everyone to upgrade uv on every release. The
 # breeze/prek uv version checks read this value dynamically and tolerate a stale
 # floor; `scripts/ci/prek/upgrade_important_versions.py` deliberately skips it.
-required-version = ">=0.11.7"
+required-version = ">=0.11.8"
 no-build-isolation-package = ["sphinx-redoc"]
 # Synchroonize with scripts/ci/prek/upgrade_important_versions.py
 exclude-newer = "4 days"
@@ -1499,6 +1499,18 @@ apache-airflow-task-sdk-integration-tests = false
 apache-aurflow-docker-stack = false
 # End of automatically generated exclude-newer-package entries
 
+# Manual overrides (kept outside the auto-generated block above so the
+# update_airflow_pyproject_toml.py script doesn't clobber them).
+# uv 0.11.8 lifted the timestamp from `uv.lock` for relative `exclude-newer`
+# (https://github.com/astral-sh/uv/issues/18708, fixed in
+# https://github.com/astral-sh/uv/pull/19022) — we want that fix, but the
+# global 4-day cooldown above would otherwise block a freshly-published uv
+# from being adopted as the floor. Drop uv's cooldown to 12 hours so the
+# pinned `required-version` floor isn't gated by the project-wide window.
+# REMOVE BY 2026-05-01 — once 0.11.8 is older than the global 4-day cooldown
+# this override is redundant and should be deleted along with the line below.
+uv = "12 hours"
+
 [tool.uv.pip]
 # Synchroonize with scripts/ci/prek/upgrade_important_versions.py
 exclude-newer = "4 days"
@@ -1637,6 +1649,11 @@ apache-airflow-task-sdk-integration-tests = false
 apache-aurflow-docker-stack = false
 # End of automatically generated exclude-newer-package-pip entries
 
+# Manual overrides — see the matching block under
+# `[tool.uv.exclude-newer-package]` above for rationale.
+# REMOVE BY 2026-05-01 along with the matching entry above.
+uv = "12 hours"
+
 
 [tool.uv.sources]
 # These names must match the names as defined in the pyproject.toml of the workspace items,
diff --git a/uv.lock b/uv.lock
