diff --git a/.github/actions/install-pre-commit/action.yml b/.github/actions/install-pre-commit/action.yml index b60597dd24076..291e911abdcd8 100644 --- a/.github/actions/install-pre-commit/action.yml +++ b/.github/actions/install-pre-commit/action.yml @@ -24,7 +24,7 @@ inputs: default: "3.9" uv-version: description: 'uv version to use' - default: "0.8.0" # Keep this comment to allow automatic replacement of uv version + default: "0.8.4" # Keep this comment to allow automatic replacement of uv version pre-commit-version: description: 'pre-commit version to use' default: "4.2.0" # Keep this comment to allow automatic replacement of pre-commit version diff --git a/.github/workflows/ci-amd.yml b/.github/workflows/ci-amd.yml index d0eb5fe70f66c..90b957b95f3e7 100644 --- a/.github/workflows/ci-amd.yml +++ b/.github/workflows/ci-amd.yml @@ -184,7 +184,7 @@ jobs: - name: Install pre-commit, uv, and pre-commit-uv shell: bash env: - UV_VERSION: "0.8.0" # Keep this comment to allow automatic replacement of uv version + UV_VERSION: "0.8.4" # Keep this comment to allow automatic replacement of uv version PRE_COMMIT_VERSION: "4.2.0" # Keep this comment to allow automatic replacement of pre-commit version PRE_COMMIT_UV_VERSION: "4.1.4" # Keep this comment to allow automatic replacement of pre-commit-uv version run: | diff --git a/Dockerfile b/Dockerfile index 6b5a9611ee7d4..4cc2a49dc7413 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,10 +54,10 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm" # You can swap comments between those two args to test pip from the main version # When you attempt to test if the version of `pip` from specified branch works for our builds # Also use `force pip` label on your PR to swap all places we use `uv` to `pip` -ARG AIRFLOW_PIP_VERSION=25.1.1 +ARG AIRFLOW_PIP_VERSION=25.2 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main" ARG AIRFLOW_SETUPTOOLS_VERSION=80.9.0 -ARG AIRFLOW_UV_VERSION=0.8.0 +ARG AIRFLOW_UV_VERSION=0.8.4 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 85c3220053401..a38cebd0086eb 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1442,10 +1442,10 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe # You can swap comments between those two args to test pip from the main version # When you attempt to test if the version of `pip` from specified branch works for our builds # Also use `force pip` label on your PR to swap all places we use `uv` to `pip` -ARG AIRFLOW_PIP_VERSION=25.1.1 +ARG AIRFLOW_PIP_VERSION=25.2 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main" ARG AIRFLOW_SETUPTOOLS_VERSION=80.9.0 -ARG AIRFLOW_UV_VERSION=0.8.0 +ARG AIRFLOW_UV_VERSION=0.8.4 # TODO(potiuk): automate with upgrade check (possibly) ARG AIRFLOW_PRE_COMMIT_VERSION="4.2.0" ARG AIRFLOW_PRE_COMMIT_UV_VERSION="4.1.4" diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md index 1c529ed87c619..0e065061fbe24 100644 --- a/dev/breeze/doc/ci/02_images.md +++ b/dev/breeze/doc/ci/02_images.md @@ -442,8 +442,8 @@ can be used for CI images: | `DEV_APT_DEPS` | | Dev APT dependencies installed in the first part of the image (default empty means default dependencies are used) | | `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` | `25.1.1` | `pip` version used. | -| `AIRFLOW_UV_VERSION` | `0.8.0` | `uv` version used. | +| `AIRFLOW_PIP_VERSION` | `25.2` | `pip` version used. | +| `AIRFLOW_UV_VERSION` | `0.8.4` | `uv` version used. | | `AIRFLOW_PRE_COMMIT_VERSION` | `4.2.0` | `pre-commit` version used. | | `AIRFLOW_PRE_COMMIT_UV_VERSION` | `4.1.4` | `pre-commit-uv` version used. | | `AIRFLOW_USE_UV` | `true` | Whether to use UV for 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 ec41b658159c4..20634be07cae5 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -244,8 +244,8 @@ class VersionedFile(NamedTuple): file_name: str -AIRFLOW_PIP_VERSION = "25.1.1" -AIRFLOW_UV_VERSION = "0.8.0" +AIRFLOW_PIP_VERSION = "25.2" +AIRFLOW_UV_VERSION = "0.8.4" AIRFLOW_USE_UV = False GITPYTHON_VERSION = "3.1.44" RICH_VERSION = "14.0.0" diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index c1331e4d18afa..d45ec156be636 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -198,8 +198,8 @@ ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"] -PIP_VERSION = "25.1.1" -UV_VERSION = "0.8.0" +PIP_VERSION = "25.2" +UV_VERSION = "0.8.4" DEFAULT_UV_HTTP_TIMEOUT = 300 DEFAULT_WSL2_HTTP_TIMEOUT = 900 diff --git a/pyproject.toml b/pyproject.toml index 070e60825992d..a2f13859f9014 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -518,7 +518,7 @@ packages = [] "apache-airflow-providers-amazon[s3fs]", ] "uv" = [ - "uv>=0.8.0", + "uv>=0.8.4", ] diff --git a/scripts/ci/install_breeze.sh b/scripts/ci/install_breeze.sh index 92023598b10cf..ed0785ba3e0b0 100755 --- a/scripts/ci/install_breeze.sh +++ b/scripts/ci/install_breeze.sh @@ -21,8 +21,8 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../" PYTHON_ARG="" -PIP_VERSION="25.1.1" -UV_VERSION="0.8.0" +PIP_VERSION="25.2" +UV_VERSION="0.8.4" if [[ ${PYTHON_VERSION=} != "" ]]; then PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") " fi diff --git a/scripts/tools/setup_breeze b/scripts/tools/setup_breeze index 5dd542677f5b8..c73fe549d6b8d 100755 --- a/scripts/tools/setup_breeze +++ b/scripts/tools/setup_breeze @@ -27,7 +27,7 @@ COLOR_YELLOW=$'\e[33m' COLOR_BLUE=$'\e[34m' COLOR_RESET=$'\e[0m' -UV_VERSION="0.8.0" +UV_VERSION="0.8.4" function manual_instructions() { echo