Skip to content

Commit 378146e

Browse files
[v3-0-test] Fix broken main - update tool versions (#50136) (#50140)
(cherry picked from commit 746b6dd) Co-authored-by: Jens Scheffler <[email protected]>
1 parent d396ed9 commit 378146e

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

.github/actions/install-pre-commit/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ inputs:
2424
default: "3.9"
2525
uv-version:
2626
description: 'uv version to use'
27-
default: "0.6.17" # Keep this comment to allow automatic replacement of uv version
27+
default: "0.7.2" # Keep this comment to allow automatic replacement of uv version
2828
pre-commit-version:
2929
description: 'pre-commit version to use'
3030
default: "4.2.0" # Keep this comment to allow automatic replacement of pre-commit version

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm"
5454
# You can swap comments between those two args to test pip from the main version
5555
# When you attempt to test if the version of `pip` from specified branch works for our builds
5656
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
57-
ARG AIRFLOW_PIP_VERSION=25.1
57+
ARG AIRFLOW_PIP_VERSION=25.1.1
5858
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
59-
ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.1
60-
ARG AIRFLOW_UV_VERSION=0.6.17
59+
ARG AIRFLOW_SETUPTOOLS_VERSION=80.1.0
60+
ARG AIRFLOW_UV_VERSION=0.7.2
6161
ARG AIRFLOW_USE_UV="false"
6262
ARG UV_HTTP_TIMEOUT="300"
6363
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"

Dockerfile.ci

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,10 +1359,10 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
13591359
# You can swap comments between those two args to test pip from the main version
13601360
# When you attempt to test if the version of `pip` from specified branch works for our builds
13611361
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
1362-
ARG AIRFLOW_PIP_VERSION=25.1
1362+
ARG AIRFLOW_PIP_VERSION=25.1.1
13631363
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
1364-
ARG AIRFLOW_SETUPTOOLS_VERSION=79.0.1
1365-
ARG AIRFLOW_UV_VERSION=0.6.17
1364+
ARG AIRFLOW_SETUPTOOLS_VERSION=80.1.0
1365+
ARG AIRFLOW_UV_VERSION=0.7.2
13661366
# TODO(potiuk): automate with upgrade check (possibly)
13671367
ARG AIRFLOW_PRE_COMMIT_VERSION="4.2.0"
13681368
ARG AIRFLOW_PRE_COMMIT_UV_VERSION="4.1.4"

dev/breeze/doc/ci/02_images.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ can be used for CI images:
442442
| `DEV_APT_DEPS` | | Dev APT dependencies installed in the first part of the image (default empty means default dependencies are used) |
443443
| `ADDITIONAL_DEV_APT_DEPS` | | Additional apt dev dependencies installed in the first part of the image |
444444
| `ADDITIONAL_DEV_APT_ENV` | | Additional env variables defined when installing dev deps |
445-
| `AIRFLOW_PIP_VERSION` | `25.1` | `pip` version used. |
446-
| `AIRFLOW_UV_VERSION` | `0.6.17` | `uv` version used. |
445+
| `AIRFLOW_PIP_VERSION` | `25.1.1` | `pip` version used. |
446+
| `AIRFLOW_UV_VERSION` | `0.7.2` | `uv` version used. |
447447
| `AIRFLOW_PRE_COMMIT_VERSION` | `4.2.0` | `pre-commit` version used. |
448448
| `AIRFLOW_PRE_COMMIT_UV_VERSION` | `4.1.4` | `pre-commit-uv` version used. |
449449
| `AIRFLOW_USE_UV` | `true` | Whether to use UV for installation. |

dev/breeze/src/airflow_breeze/commands/release_management_commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ class VersionedFile(NamedTuple):
235235
file_name: str
236236

237237

238-
AIRFLOW_PIP_VERSION = "25.1"
239-
AIRFLOW_UV_VERSION = "0.6.17"
238+
AIRFLOW_PIP_VERSION = "25.1.1"
239+
AIRFLOW_UV_VERSION = "0.7.2"
240240
AIRFLOW_USE_UV = False
241241
# TODO(potiuk): automate upgrades of these versions (likely via requirements.txt file)
242242
GITPYTHON_VERSION = "3.1.44"

dev/breeze/src/airflow_breeze/global_constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@
198198

199199
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]
200200

201-
PIP_VERSION = "25.1"
202-
UV_VERSION = "0.6.17"
201+
PIP_VERSION = "25.1.1"
202+
UV_VERSION = "0.7.2"
203203

204204
DEFAULT_UV_HTTP_TIMEOUT = 300
205205
DEFAULT_WSL2_HTTP_TIMEOUT = 900

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ packages = []
518518
"apache-airflow-providers-amazon[s3fs]",
519519
]
520520
"uv" = [
521-
"uv>=0.6.17",
521+
"uv>=0.7.2",
522522
]
523523

524524

scripts/ci/install_breeze.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../"
2121

2222
PYTHON_ARG=""
2323

24-
PIP_VERSION="25.1"
25-
UV_VERSION="0.6.17"
24+
PIP_VERSION="25.1.1"
25+
UV_VERSION="0.7.2"
2626
if [[ ${PYTHON_VERSION=} != "" ]]; then
2727
PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") "
2828
fi

scripts/tools/setup_breeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ COLOR_YELLOW=$'\e[33m'
2727
COLOR_BLUE=$'\e[34m'
2828
COLOR_RESET=$'\e[0m'
2929

30-
UV_VERSION="0.6.17"
30+
UV_VERSION="0.7.2"
3131

3232
function manual_instructions() {
3333
echo

0 commit comments

Comments
 (0)