From 0ec6d08ca62fcc0bcf471b92dd757cff012e2792 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Thu, 17 Oct 2024 16:30:04 +0100 Subject: [PATCH] Bump to `0.4.23` to fix a uv bug (#43121) Now that https://github.com/astral-sh/uv/issues/8236 is fixed (a bug in uv 0.4.22), we can remove `--no-sources` (used in `uv pip install`) introduced in https://github.com/apache/airflow/pull/43056 --- Dockerfile | 2 +- Dockerfile.ci | 4 ++-- dev/breeze/doc/ci/02_images.md | 2 +- .../airflow_breeze/commands/release_management_commands.py | 2 +- scripts/in_container/install_airflow_and_providers.py | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 129de7a3f61ff..4e3aa5ac9009a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ ARG AIRFLOW_VERSION="2.10.2" ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm" ARG AIRFLOW_PIP_VERSION=24.2 -ARG AIRFLOW_UV_VERSION=0.4.22 +ARG AIRFLOW_UV_VERSION=0.4.23 ARG AIRFLOW_USE_UV="false" ARG UV_HTTP_TIMEOUT="300" ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow" diff --git a/Dockerfile.ci b/Dockerfile.ci index cab5c91e2016d..86268bf9209c3 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1278,7 +1278,7 @@ ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main" ARG AIRFLOW_CI_BUILD_EPOCH="10" ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true" ARG AIRFLOW_PIP_VERSION=24.2 -ARG AIRFLOW_UV_VERSION=0.4.22 +ARG AIRFLOW_UV_VERSION=0.4.23 ARG AIRFLOW_USE_UV="true" # Setup PIP # By default PIP install run without cache to make image smaller @@ -1302,7 +1302,7 @@ ARG AIRFLOW_VERSION="" ARG ADDITIONAL_PIP_INSTALL_FLAGS="" ARG AIRFLOW_PIP_VERSION=24.2 -ARG AIRFLOW_UV_VERSION=0.4.22 +ARG AIRFLOW_UV_VERSION=0.4.23 ARG AIRFLOW_USE_UV="true" ENV AIRFLOW_REPO=${AIRFLOW_REPO}\ diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md index c83adcdc03e14..982f6ac1c200f 100644 --- a/dev/breeze/doc/ci/02_images.md +++ b/dev/breeze/doc/ci/02_images.md @@ -448,7 +448,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` | `24.0` | PIP version used. | -| `AIRFLOW_UV_VERSION` | `0.4.22` | UV version used. | +| `AIRFLOW_UV_VERSION` | `0.4.23` | UV 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 index d42b3b7e95cb9..d5470f5a87881 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -230,7 +230,7 @@ class VersionedFile(NamedTuple): AIRFLOW_PIP_VERSION = "24.0" -AIRFLOW_UV_VERSION = "0.4.22" +AIRFLOW_UV_VERSION = "0.4.23" AIRFLOW_USE_UV = False WHEEL_VERSION = "0.36.2" GITPYTHON_VERSION = "3.1.40" diff --git a/scripts/in_container/install_airflow_and_providers.py b/scripts/in_container/install_airflow_and_providers.py index 909eb98c2af96..bc28155875848 100755 --- a/scripts/in_container/install_airflow_and_providers.py +++ b/scripts/in_container/install_airflow_and_providers.py @@ -484,7 +484,6 @@ def install_airflow_and_providers( "/usr/local/bin/uv", "pip", "install", - "--no-sources", "--python", "/usr/local/bin/python", installation_spec.airflow_package, @@ -507,7 +506,6 @@ def install_airflow_and_providers( "/usr/local/bin/uv", "pip", "install", - "--no-sources", "--python", "/usr/local/bin/python", ]