From 0d224dc0ff827802b99f158923505dd2e0717efc Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Mon, 28 Oct 2024 22:33:45 +0000 Subject: [PATCH 1/2] Bump `uv` to `0.4.28` https://pypi.org/project/uv/0.4.28/ --- Dockerfile | 2 +- Dockerfile.ci | 2 +- dev/breeze/doc/ci/02_images.md | 2 +- .../src/airflow_breeze/commands/release_management_commands.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac3e810136f67..10ceb8996f9d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm" # Also use `force pip` label on your PR to swap all places we use `uv` to `pip` ARG AIRFLOW_PIP_VERSION=24.3.1 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main" -ARG AIRFLOW_UV_VERSION=0.4.27 +ARG AIRFLOW_UV_VERSION=0.4.28 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 dadd6c827f57d..114f127390145 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1366,7 +1366,7 @@ RUN bash /scripts/docker/install_packaging_tools.sh; \ # Also use `force pip` label on your PR to swap all places we use `uv` to `pip` ARG AIRFLOW_PIP_VERSION=24.3.1 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main" -ARG AIRFLOW_UV_VERSION=0.4.27 +ARG AIRFLOW_UV_VERSION=0.4.28 ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \ AIRFLOW_UV_VERSION=${AIRFLOW_UV_VERSION} diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md index 2e9b250086585..c916295e7bd91 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.3.1` | PIP version used. | -| `AIRFLOW_UV_VERSION` | `0.4.27` | UV version used. | +| `AIRFLOW_UV_VERSION` | `0.4.28` | 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 45f0f72c8521a..3ca07bbbce14b 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.3.1" -AIRFLOW_UV_VERSION = "0.4.27" +AIRFLOW_UV_VERSION = "0.4.28" AIRFLOW_USE_UV = False WHEEL_VERSION = "0.36.2" GITPYTHON_VERSION = "3.1.40" From 35d091a1c1a7a4db90fdea79a101ea5a8642d645 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Mon, 28 Oct 2024 22:42:13 +0000 Subject: [PATCH 2/2] fixup! Bump `uv` to `0.4.28` --- generated/provider_dependencies.json | 1 - providers/src/airflow/providers/cloudant/provider.yaml | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index b1e621808caa6..80ed962fa98a0 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -352,7 +352,6 @@ "cloudant": { "deps": [ "apache-airflow>=2.8.0", - "ibmcloudant==0.7.0 ; python_version < \"3.10\"", "ibmcloudant==0.9.1 ; python_version >= \"3.10\"" ], "devel-deps": [], diff --git a/providers/src/airflow/providers/cloudant/provider.yaml b/providers/src/airflow/providers/cloudant/provider.yaml index 2252c313c3ff8..93905f450af65 100644 --- a/providers/src/airflow/providers/cloudant/provider.yaml +++ b/providers/src/airflow/providers/cloudant/provider.yaml @@ -49,12 +49,9 @@ versions: dependencies: - apache-airflow>=2.8.0 - # Even though 3.9 is excluded below, we need to make this python_version aware so that `uv` (at least as of - # 0.4.25) can generate a full lock file when building lock file from provider sources. Seeing the duplicate - # dep makes the UV resolver correctly "fork" and try to come up with alternative solutions. - # https://github.com/astral-sh/uv/issues/4668 + # Even though 3.9 is excluded below, we need to make this python_version aware so that `uv` can generate a + # full lock file when building lock file from provider sources - 'ibmcloudant==0.9.1 ; python_version >= "3.10"' - - 'ibmcloudant==0.7.0 ; python_version < "3.10"' excluded-python-versions: # ibmcloudant transitively brings in urllib3 2.x, but the snowflake provider has a dependency that pins