You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2025/04/23 11:00:05 UTC
(airflow) branch main updated: Fixing upgrade checks on main (#49610)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new bf2846be441 Fixing upgrade checks on main (#49610)
bf2846be441 is described below
commit bf2846be4417b7b6a84e16985ef49abd3f4de4b1
Author: Amogh Desai <am...@gmail.com>
AuthorDate: Wed Apr 23 16:29:58 2025 +0530
Fixing upgrade checks on main (#49610)
* Fixing upgrade checks on main
* reuse variable
---
.github/actions/install-pre-commit/action.yml | 2 +-
.pre-commit-config.yaml | 2 +-
Dockerfile | 4 ++--
Dockerfile.ci | 4 ++--
airflow-core/pyproject.toml | 2 +-
dev/breeze/doc/ci/02_images.md | 2 +-
dev/breeze/src/airflow_breeze/commands/release_management_commands.py | 4 ++--
dev/breeze/src/airflow_breeze/global_constants.py | 2 +-
scripts/ci/install_breeze.sh | 2 +-
scripts/tools/setup_breeze | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/actions/install-pre-commit/action.yml b/.github/actions/install-pre-commit/action.yml
index dd794484151..d3afae46b86 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.6.13" # Keep this comment to allow automatic replacement of uv version
+ default: "0.6.16" # 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/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 57d7e7403f6..964ebe4aa09 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@
default_stages: [pre-commit, pre-push]
default_language_version:
python: python3
- node: 22.14.0
+ node: 22.15.0
minimum_pre_commit_version: '3.2.0'
exclude: ^.*/.*_vendor/
repos:
diff --git a/Dockerfile b/Dockerfile
index 37ac245da5b..6e805ed1ec4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,8 +56,8 @@ 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=25.0.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_SETUPTOOLS_VERSION=78.1.0
-ARG AIRFLOW_UV_VERSION=0.6.13
+ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.0
+ARG AIRFLOW_UV_VERSION=0.6.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 b722ff01329..ebdae71ffe4 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1355,8 +1355,8 @@ 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.0.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_SETUPTOOLS_VERSION=78.1.0
-ARG AIRFLOW_UV_VERSION=0.6.13
+ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.0
+ARG AIRFLOW_UV_VERSION=0.6.16
# 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/airflow-core/pyproject.toml b/airflow-core/pyproject.toml
index 757b51e96d0..01604cc8684 100644
--- a/airflow-core/pyproject.toml
+++ b/airflow-core/pyproject.toml
@@ -216,7 +216,7 @@ dependencies = [
"statsd>=3.3.0",
]
"uv" = [
- "uv>=0.6.13",
+ "uv>=0.6.16",
]
"all" = [
"apache-airflow-core[aiobotocore,apache-atlas,apache-webhdfs,cloudpickle,github-enterprise,google-auth,graphviz,kerberos,ldap,otel,pandas,rabbitmq,s3fs,sentry,statsd,uv]"
diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md
index 341fd4f7f1b..c59e1c8183d 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.0.1` | `pip` version used. |
-| `AIRFLOW_UV_VERSION` | `0.6.13` | `uv` version used. |
+| `AIRFLOW_UV_VERSION` | `0.6.16` | `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 414550d1771..579a7299014 100644
--- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
@@ -94,6 +94,7 @@ from airflow_breeze.global_constants import (
CURRENT_PYTHON_MAJOR_MINOR_VERSIONS,
DEFAULT_PYTHON_MAJOR_MINOR_VERSION,
MULTI_PLATFORM,
+ UV_VERSION,
)
from airflow_breeze.params.shell_params import ShellParams
from airflow_breeze.prepare_providers.provider_distributions import (
@@ -245,7 +246,7 @@ class VersionedFile(NamedTuple):
AIRFLOW_PIP_VERSION = "25.0.1"
-AIRFLOW_UV_VERSION = "0.6.13"
+AIRFLOW_UV_VERSION = "0.6.16"
AIRFLOW_USE_UV = False
# TODO(potiuk): automate upgrades of these versions (likely via requirements.txt file)
GITPYTHON_VERSION = "3.1.44"
@@ -253,7 +254,6 @@ RICH_VERSION = "13.9.4"
PRE_COMMIT_VERSION = "4.2.0"
HATCH_VERSION = "1.14.0"
PYYAML_VERSION = "6.0.2"
-UV_VERSION = "0.6.13"
# no need for pre-commit-uv. Those commands will only ever initialize the compile-www-assets
# pre-commit environment and this is done with node, no python installation is needed.
diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py
index fac25a87401..d131afb8648 100644
--- a/dev/breeze/src/airflow_breeze/global_constants.py
+++ b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -194,7 +194,7 @@ if MYSQL_INNOVATION_RELEASE:
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]
PIP_VERSION = "25.0.1"
-UV_VERSION = "0.6.13"
+UV_VERSION = "0.6.16"
DEFAULT_UV_HTTP_TIMEOUT = 300
DEFAULT_WSL2_HTTP_TIMEOUT = 900
diff --git a/scripts/ci/install_breeze.sh b/scripts/ci/install_breeze.sh
index fac901d750d..14a06747fc2 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.0.1"
-UV_VERSION="0.6.13"
+UV_VERSION="0.6.16"
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 0adabe04485..6d805d19760 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.6.13"
+UV_VERSION="0.6.16"
function manual_instructions() {
echo