This is an automated email from the ASF dual-hosted git repository.
jscheffl 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 cc2bb0d93ae Fix broken main - upgrade tool versions (#49825)
cc2bb0d93ae is described below
commit cc2bb0d93ae4f54f0223a46245a16eba339c9b55
Author: Jens Scheffler <[email protected]>
AuthorDate: Sat Apr 26 17:12:42 2025 +0200
Fix broken main - upgrade tool versions (#49825)
---
.github/actions/install-pre-commit/action.yml | 2 +-
Dockerfile | 6 +++---
Dockerfile.ci | 6 +++---
airflow-core/pyproject.toml | 2 +-
dev/breeze/doc/ci/02_images.md | 4 ++--
.../src/airflow_breeze/commands/release_management_commands.py | 4 ++--
dev/breeze/src/airflow_breeze/global_constants.py | 4 ++--
scripts/ci/install_breeze.sh | 4 ++--
scripts/tools/setup_breeze | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.github/actions/install-pre-commit/action.yml
b/.github/actions/install-pre-commit/action.yml
index e17fe67b2ee..9fdb53c61b2 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.16" # Keep this comment to allow automatic replacement of
uv version
+ default: "0.6.17" # 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/Dockerfile b/Dockerfile
index 8fb09c7ce8e..a7261dade0c 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.0.1
+ARG AIRFLOW_PIP_VERSION=25.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main";
-ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.0
-ARG AIRFLOW_UV_VERSION=0.6.16
+ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.1
+ARG AIRFLOW_UV_VERSION=0.6.17
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 eaeb2c393fa..bd3dd97be73 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1353,10 +1353,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.0.1
+ARG AIRFLOW_PIP_VERSION=25.1
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main";
-ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.0
-ARG AIRFLOW_UV_VERSION=0.6.16
+ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.1
+ARG AIRFLOW_UV_VERSION=0.6.17
# 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 cb4a55d289e..7eaf3c322a2 100644
--- a/airflow-core/pyproject.toml
+++ b/airflow-core/pyproject.toml
@@ -216,7 +216,7 @@ dependencies = [
"statsd>=3.3.0",
]
"uv" = [
- "uv>=0.6.16",
+ "uv>=0.6.17",
]
"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 c59e1c8183d..45b28ef13f2 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.0.1` | `pip`
version used.
|
-| `AIRFLOW_UV_VERSION` | `0.6.16` | `uv`
version used.
|
+| `AIRFLOW_PIP_VERSION` | `25.1` | `pip`
version used.
|
+| `AIRFLOW_UV_VERSION` | `0.6.17` | `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 419e0427bd7..8e05be6e542 100644
--- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
@@ -237,8 +237,8 @@ class VersionedFile(NamedTuple):
file_name: str
-AIRFLOW_PIP_VERSION = "25.0.1"
-AIRFLOW_UV_VERSION = "0.6.16"
+AIRFLOW_PIP_VERSION = "25.1"
+AIRFLOW_UV_VERSION = "0.6.17"
AIRFLOW_USE_UV = False
# TODO(potiuk): automate upgrades of these versions (likely via
requirements.txt file)
GITPYTHON_VERSION = "3.1.44"
diff --git a/dev/breeze/src/airflow_breeze/global_constants.py
b/dev/breeze/src/airflow_breeze/global_constants.py
index 29232f2a041..e777870e376 100644
--- a/dev/breeze/src/airflow_breeze/global_constants.py
+++ b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -194,8 +194,8 @@ if MYSQL_INNOVATION_RELEASE:
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]
-PIP_VERSION = "25.0.1"
-UV_VERSION = "0.6.16"
+PIP_VERSION = "25.1"
+UV_VERSION = "0.6.17"
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 14a06747fc2..eceb264d82b 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.0.1"
-UV_VERSION="0.6.16"
+PIP_VERSION="25.1"
+UV_VERSION="0.6.17"
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 6d805d19760..b30cb14100e 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.16"
+UV_VERSION="0.6.17"
function manual_instructions() {
echo
