This is an automated email from the ASF dual-hosted git repository. kaxilnaik pushed a commit to branch v3-1-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit a738cc1bf95ad54c0086515d2cd47506ae07e1c2 Author: GPK <[email protected]> AuthorDate: Thu Sep 11 01:13:45 2025 +0100 CI: Bump UV and Ruff (#55480) * Bump UV and Ruff * Fix ruff static check errors (cherry picked from commit 3e776cc5642d549d2130006844489c284ae771ba) --- .github/actions/install-prek/action.yml | 2 +- .github/workflows/basic-tests.yml | 2 +- .github/workflows/release_dockerhub_image.yml | 2 +- .pre-commit-config.yaml | 2 +- Dockerfile | 2 +- Dockerfile.ci | 2 +- airflow-core/docs/best-practices.rst | 2 +- airflow-core/docs/conf.py | 12 ++++++------ chart/docs/conf.py | 6 +++--- dev/breeze/doc/ci/02_images.md | 2 +- .../airflow_breeze/commands/release_management_commands.py | 2 +- dev/breeze/src/airflow_breeze/global_constants.py | 2 +- devel-common/pyproject.toml | 2 +- docker-stack-docs/conf.py | 3 ++- providers-summary-docs/conf.py | 6 +++--- pyproject.toml | 2 +- scripts/ci/install_breeze.sh | 2 +- scripts/ci/prek/check_imports_in_providers.py | 2 +- scripts/ci/prek/ruff_format.py | 2 +- scripts/tools/setup_breeze | 2 +- 20 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/actions/install-prek/action.yml b/.github/actions/install-prek/action.yml index 3bf30da69c9..30cdd76306c 100644 --- a/.github/actions/install-prek/action.yml +++ b/.github/actions/install-prek/action.yml @@ -24,7 +24,7 @@ inputs: default: "3.10" uv-version: description: 'uv version to use' - default: "0.8.15" # Keep this comment to allow automatic replacement of uv version + default: "0.8.16" # Keep this comment to allow automatic replacement of uv version prek-version: description: 'prek version to use' default: "0.1.6" # Keep this comment to allow automatic replacement of prek version diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 548b9ce5b0f..a562f536248 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -66,7 +66,7 @@ on: # yamllint disable-line rule:truthy type: string uv-version: description: 'uv version to use' - default: "0.8.15" # Keep this comment to allow automatic replacement of uv version + default: "0.8.16" # Keep this comment to allow automatic replacement of uv version type: string platform: description: 'Platform for the build - linux/amd64 or linux/arm64' diff --git a/.github/workflows/release_dockerhub_image.yml b/.github/workflows/release_dockerhub_image.yml index 4c1349f20f0..b01c87e0abc 100644 --- a/.github/workflows/release_dockerhub_image.yml +++ b/.github/workflows/release_dockerhub_image.yml @@ -58,7 +58,7 @@ jobs: AIRFLOW_VERSION: ${{ github.event.inputs.airflowVersion }} AMD_ONLY: ${{ github.event.inputs.amdOnly }} LIMIT_PYTHON_VERSIONS: ${{ github.event.inputs.limitPythonVersions }} - UV_VERSION: "0.8.15" # Keep this comment to allow automatic replacement of uv version + UV_VERSION: "0.8.16" # Keep this comment to allow automatic replacement of uv version if: contains(fromJSON('[ "ashb", "eladkal", diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aac71bbb179..d9dd6131a09 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -426,7 +426,7 @@ repos: types_or: [python, pyi] args: [--fix] require_serial: true - additional_dependencies: ['ruff==0.12.12'] + additional_dependencies: ['ruff==0.13.0'] exclude: ^airflow-core/tests/unit/dags/test_imports\.py$|^performance/tests/test_.*\.py$ - id: ruff-format name: Run 'ruff format' diff --git a/Dockerfile b/Dockerfile index 2bef0b0887a..43d13166f11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ ARG BASE_IMAGE="debian:bookworm-slim" # Also use `force pip` label on your PR to swap all places we use `uv` to `pip` ARG AIRFLOW_PIP_VERSION=25.2 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"; -ARG AIRFLOW_UV_VERSION=0.8.15 +ARG AIRFLOW_UV_VERSION=0.8.16 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 b56d94bf7e8..6d357db6b47 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1655,7 +1655,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=25.2 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"; -ARG AIRFLOW_UV_VERSION=0.8.15 +ARG AIRFLOW_UV_VERSION=0.8.16 ARG AIRFLOW_PREK_VERSION="0.1.6" # UV_LINK_MODE=copy is needed since we are using cache mounted from the host diff --git a/airflow-core/docs/best-practices.rst b/airflow-core/docs/best-practices.rst index 5c8fdf43dc6..7feb0089bec 100644 --- a/airflow-core/docs/best-practices.rst +++ b/airflow-core/docs/best-practices.rst @@ -310,7 +310,7 @@ Installing and Using ruff .. code-block:: bash - pip install "ruff>=0.12.12" + pip install "ruff>=0.13.0" 2. **Running ruff**: Execute ``ruff`` to check your Dags for potential issues: diff --git a/airflow-core/docs/conf.py b/airflow-core/docs/conf.py index c9886a172b3..bd63dd2771f 100644 --- a/airflow-core/docs/conf.py +++ b/airflow-core/docs/conf.py @@ -27,12 +27,6 @@ import re from pathlib import Path from typing import Any -from packaging.version import Version, parse as parse_version - -import airflow -from airflow.api_fastapi.auth.managers.simple.openapi import __file__ as sam_openapi_file -from airflow.api_fastapi.core_api.openapi import __file__ as main_openapi_file -from airflow.configuration import retrieve_configuration_description from docs.utils.conf_constants import ( AIRFLOW_CORE_DOC_STATIC_PATH, AIRFLOW_CORE_DOCKER_COMPOSE_PATH, @@ -61,6 +55,12 @@ from docs.utils.conf_constants import ( get_rst_filepath_from_path, skip_util_classes_extension, ) +from packaging.version import Version, parse as parse_version + +import airflow +from airflow.api_fastapi.auth.managers.simple.openapi import __file__ as sam_openapi_file +from airflow.api_fastapi.core_api.openapi import __file__ as main_openapi_file +from airflow.configuration import retrieve_configuration_description PACKAGE_NAME = "apache-airflow" PACKAGE_VERSION = airflow.__version__ diff --git a/chart/docs/conf.py b/chart/docs/conf.py index 59e448d936c..c0d022eab98 100644 --- a/chart/docs/conf.py +++ b/chart/docs/conf.py @@ -38,9 +38,6 @@ import re from typing import Any import yaml -from packaging.version import parse as parse_version - -import airflow from docs.utils.conf_constants import ( AIRFLOW_FAVICON_PATH, AIRFLOW_REPO_ROOT_PATH, @@ -59,6 +56,9 @@ from docs.utils.conf_constants import ( get_intersphinx_mapping, get_rst_epilogue, ) +from packaging.version import parse as parse_version + +import airflow PACKAGE_NAME = "helm-chart" CHART_ROOT_PATH = AIRFLOW_REPO_ROOT_PATH / "chart" diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md index 302caf883b8..bd8a3fc2a73 100644 --- 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` | `25.2` | `pip` version used. | -| `AIRFLOW_UV_VERSION` | `0.8.15` | `uv` version used. | +| `AIRFLOW_UV_VERSION` | `0.8.16` | `uv` version used. | | `AIRFLOW_PREK_VERSION` | `0.1.6` | `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 index 23fe43ff124..d87a5853839 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -253,7 +253,7 @@ class VersionedFile(NamedTuple): AIRFLOW_PIP_VERSION = "25.2" -AIRFLOW_UV_VERSION = "0.8.15" +AIRFLOW_UV_VERSION = "0.8.16" AIRFLOW_USE_UV = False GITPYTHON_VERSION = "3.1.45" RICH_VERSION = "14.1.0" diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index 43d74aa2376..01c3e9de821 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -201,7 +201,7 @@ if MYSQL_INNOVATION_RELEASE: ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"] PIP_VERSION = "25.2" -UV_VERSION = "0.8.15" +UV_VERSION = "0.8.16" DEFAULT_UV_HTTP_TIMEOUT = 300 DEFAULT_WSL2_HTTP_TIMEOUT = 900 diff --git a/devel-common/pyproject.toml b/devel-common/pyproject.toml index 7cb72bba82c..d15142e003a 100644 --- a/devel-common/pyproject.toml +++ b/devel-common/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "kgb>=7.2.0", "requests_mock>=1.11.0", "rich>=13.6.0", - "ruff==0.12.12", + "ruff==0.13.0", "semver>=3.0.2", "time-machine>=2.15.0", "wheel>=0.42.0", diff --git a/docker-stack-docs/conf.py b/docker-stack-docs/conf.py index c42e311844c..e7919e2ca68 100644 --- a/docker-stack-docs/conf.py +++ b/docker-stack-docs/conf.py @@ -35,7 +35,6 @@ import logging import os from typing import Any -import airflow from docs.utils.conf_constants import ( AIRFLOW_FAVICON_PATH, AIRFLOW_REPO_ROOT_PATH, @@ -56,6 +55,8 @@ from docs.utils.conf_constants import ( get_rst_epilogue, ) +import airflow + PACKAGE_NAME = "docker-stack" DOCKER_STACK_DOCS_PATH = AIRFLOW_REPO_ROOT_PATH / "docker-stack-docs" os.environ["AIRFLOW_PACKAGE_NAME"] = PACKAGE_NAME diff --git a/providers-summary-docs/conf.py b/providers-summary-docs/conf.py index 2219f0bcb8a..7329988f998 100644 --- a/providers-summary-docs/conf.py +++ b/providers-summary-docs/conf.py @@ -35,9 +35,6 @@ import logging import os from typing import Any -from sphinx_exts.provider_yaml_utils import load_package_data - -import airflow from docs.utils.conf_constants import ( AIRFLOW_FAVICON_PATH, AIRFLOW_REPO_ROOT_PATH, @@ -56,6 +53,9 @@ from docs.utils.conf_constants import ( get_intersphinx_mapping, get_rst_epilogue, ) +from sphinx_exts.provider_yaml_utils import load_package_data + +import airflow PACKAGE_NAME = "apache-airflow-providers" PROVIDERS_SUMMARY_DOCS_PATH = AIRFLOW_REPO_ROOT_PATH / "providers-summary-docs" diff --git a/pyproject.toml b/pyproject.toml index c824141f9bb..e484d8c92ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -535,7 +535,7 @@ packages = [] "apache-airflow-providers-amazon[s3fs]", ] "uv" = [ - "uv>=0.8.15", + "uv>=0.8.16", ] diff --git a/scripts/ci/install_breeze.sh b/scripts/ci/install_breeze.sh index e67dce4f3c4..30a1c6d9966 100755 --- a/scripts/ci/install_breeze.sh +++ b/scripts/ci/install_breeze.sh @@ -22,7 +22,7 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../" PYTHON_ARG="" PIP_VERSION="25.2" -UV_VERSION="0.8.15" +UV_VERSION="0.8.16" if [[ ${PYTHON_VERSION=} != "" ]]; then PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") " fi diff --git a/scripts/ci/prek/check_imports_in_providers.py b/scripts/ci/prek/check_imports_in_providers.py index c2b6976ea58..242c8f58c46 100755 --- a/scripts/ci/prek/check_imports_in_providers.py +++ b/scripts/ci/prek/check_imports_in_providers.py @@ -19,7 +19,7 @@ # requires-python = ">=3.10" # dependencies = [ # "rich>=13.6.0", -# "ruff==0.12.12", +# "ruff==0.13.0", # ] # /// from __future__ import annotations diff --git a/scripts/ci/prek/ruff_format.py b/scripts/ci/prek/ruff_format.py index e82d1f8e106..58bc39ac7be 100755 --- a/scripts/ci/prek/ruff_format.py +++ b/scripts/ci/prek/ruff_format.py @@ -18,7 +18,7 @@ # /// script # requires-python = ">=3.10" # dependencies = [ -# "ruff==0.12.12", +# "ruff==0.13.0", # ] # /// diff --git a/scripts/tools/setup_breeze b/scripts/tools/setup_breeze index bf7aae61d23..64fcce5ab97 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.15" +UV_VERSION="0.8.16" function manual_instructions() { echo
