Skip to content

[v3-0-test] Upgrade prek, prek hooks, breeze lock and other important… #54734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Aug 20, 2025
Merged

[v3-0-test] Upgrade prek, prek hooks, breeze lock and other important… #54734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/install-prek/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ inputs:
default: "3.9"
uv-version:
description: 'uv version to use'
default: "0.8.11" # Keep this comment to allow automatic replacement of uv version
default: "0.8.12" # Keep this comment to allow automatic replacement of uv version
prek-version:
description: 'prek version to use'
default: "0.0.29" # Keep this comment to allow automatic replacement of prek version
default: "0.1.1" # Keep this comment to allow automatic replacement of prek version
skip-prek-hooks:
description: "Skip some prek hooks from installation"
default: ""
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/basic-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,12 @@ jobs:
python-version: ${{steps.breeze.outputs.host-python-version}}
skip-prek-hooks: ${{ inputs.skip-prek-hooks }}
platform: ${{ inputs.platform }}
# TODO(potiuk): enable this once prek supports automatic upgrade of hooks
# after https://github.com/j178/prek/issues/35 is implemented§
# - name: "Autoupdate all prek hooks"
# run: prek autoupdate --freeze
# - name: "Autoupdate Lucas-C hooks to bleeding edge"
# run: prek autoupdate --bleeding-edge --freeze --repo https://github.com/Lucas-C/pre-commit-hooks
# - name: "Check if there are any changes in pre-commit hooks"
# run: git diff --exit-code
- name: "Autoupdate all prek hooks"
run: prek autoupdate --freeze
- name: "Autoupdate Lucas-C hooks to bleeding edge"
run: prek autoupdate --bleeding-edge --freeze --repo https://github.com/Lucas-C/pre-commit-hooks
- name: "Check if there are any changes in pre-commit hooks"
run: git diff --exit-code
- name: "Run automated upgrade for chart dependencies"
run: >
prek
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-amd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ jobs:
- name: Install prek, uv
shell: bash
env:
UV_VERSION: "0.8.11" # Keep this comment to allow automatic replacement of uv version
PREK_VERSION: "0.0.29" # Keep this comment to allow automatic replacement of prek version
UV_VERSION: "0.8.12" # Keep this comment to allow automatic replacement of uv version
PREK_VERSION: "0.1.1" # Keep this comment to allow automatic replacement of prek version
run: |
pip install uv==${UV_VERSION} || true
uv tool install prek==${PREK_VERSION} --with uv==${UV_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ default_language_version:
python: python3
node: 22.18.0
golang: 1.24.0
minimum_prek_version: '0.0.29'
minimum_prek_version: '0.1.1'
exclude: ^.*/.*_vendor/
repos:
- repo: meta
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm"
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.11
ARG AIRFLOW_UV_VERSION=0.8.12
ARG AIRFLOW_USE_UV="false"
ARG UV_HTTP_TIMEOUT="300"
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,9 +1444,9 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
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.11
ARG AIRFLOW_UV_VERSION=0.8.12
# TODO(potiuk): automate with upgrade check (possibly)
ARG AIRFLOW_PREK_VERSION="0.0.29"
ARG AIRFLOW_PREK_VERSION="0.1.1"

ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \
AIRFLOW_SETUPTOOLS_VERSION=${AIRFLOW_SETUPTOOLS_VERSION} \
Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,6 @@ PLEASE DO NOT MODIFY THE HASH BELOW! IT IS AUTOMATICALLY UPDATED BY PREK.

---------------------------------------------------------------------------------------------------------

Package config hash: 747085c556be1d41a28c82aaaec932329dab5fba5873903f50681a353033306ada2d0c2d1f7f0cb8f509c604865718ffc48c49724013923294ac1ade6957c507
Package config hash: 5554e882a02c79b704b1edbb346c2b08844d8f8bc64f534fa071f10f734a424aa4655099af932d027df79f51d98a7a88663f0863d8cf7fb294bc6cedc6600156

---------------------------------------------------------------------------------------------------------
4 changes: 2 additions & 2 deletions dev/breeze/doc/ci/02_images.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,8 @@ 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.8` | `uv` version used. |
| `AIRFLOW_PREK_VERSION` | `0.0.29` | `prek` version used. |
| `AIRFLOW_UV_VERSION` | `0.8.12` | `uv` version used. |
| `AIRFLOW_PREK_VERSION` | `0.1.1` | `prek` version used. |
| `AIRFLOW_USE_UV` | `true` | Whether to use UV for installation. |
| `PIP_PROGRESS_BAR` | `on` | Progress bar for PIP installation |

Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies = [
"jinja2>=3.1.5",
"jsonschema>=4.19.1",
"packaging>=23.2",
"prek>=0.0.29",
"prek>=0.1.1",
"psutil>=5.9.6",
"pygithub>=2.1.1",
"pytest-xdist>=3.3.1",
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/commands/release_management_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,11 @@ class VersionedFile(NamedTuple):


AIRFLOW_PIP_VERSION = "25.2"
AIRFLOW_UV_VERSION = "0.8.11"
AIRFLOW_UV_VERSION = "0.8.12"
AIRFLOW_USE_UV = False
GITPYTHON_VERSION = "3.1.45"
RICH_VERSION = "14.1.0"
PREK_VERSION = "0.0.29"
PREK_VERSION = "0.1.1"
HATCH_VERSION = "1.14.1"
PYYAML_VERSION = "6.0.2"

Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/src/airflow_breeze/global_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]

PIP_VERSION = "25.2"
UV_VERSION = "0.8.11"
UV_VERSION = "0.8.12"

DEFAULT_UV_HTTP_TIMEOUT = 300
DEFAULT_WSL2_HTTP_TIMEOUT = 900
Expand Down
48 changes: 24 additions & 24 deletions dev/breeze/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ packages = []
"apache-airflow-providers-amazon[s3fs]",
]
"uv" = [
"uv>=0.8.11",
"uv>=0.8.12",
]


Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/install_breeze.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../"
PYTHON_ARG=""

PIP_VERSION="25.2"
UV_VERSION="0.8.11"
UV_VERSION="0.8.12"
if [[ ${PYTHON_VERSION=} != "" ]]; then
PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") "
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/setup_breeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COLOR_YELLOW=$'\e[33m'
COLOR_BLUE=$'\e[34m'
COLOR_RESET=$'\e[0m'

UV_VERSION="0.8.11"
UV_VERSION="0.8.12"

function manual_instructions() {
echo
Expand Down
Loading