This is an automated email from the ASF dual-hosted git repository. kaxilnaik pushed a commit to branch v3-0-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit cee93e35caa53ac9d35fbe34b7e8f8ad14a70846 Author: Jarek Potiuk <[email protected]> AuthorDate: Mon Aug 18 10:21:19 2025 +0200 Change upgrading scheme for prek and bump to latest version (#54599) (#54601) The 0.0.28 prek has an important fix - avoids craching when you run `git commit -a` https://github.com/j178/prek/issues/385 - we bump the minimum_version to 0.0.28 as well as upgrading the CI and Breeze version to 0.0.28 - also, we change the strategy of failing upgrade check in CI - we do not fail the upgrade check when there is a new upgrade of `prek` - similar like with `uv` we expect new versions to be released quickly over the `teething` period. (cherry picked from commit 3aa24487f0380168812c002ed93fb141baf5aef6) --- .github/actions/install-prek/action.yml | 2 +- .github/workflows/basic-tests.yml | 4 ++-- .github/workflows/ci-amd.yml | 6 +++--- .pre-commit-config.yaml | 2 +- Dockerfile.ci | 2 +- dev/breeze/README.md | 2 +- dev/breeze/doc/ci/02_images.md | 2 +- dev/breeze/pyproject.toml | 2 +- .../src/airflow_breeze/commands/release_management_commands.py | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/actions/install-prek/action.yml b/.github/actions/install-prek/action.yml index aa87256b35b..ee96de05ffb 100644 --- a/.github/actions/install-prek/action.yml +++ b/.github/actions/install-prek/action.yml @@ -27,7 +27,7 @@ inputs: default: "0.8.11" # Keep this comment to allow automatic replacement of uv version prek-version: description: 'prek version to use' - default: "0.0.27" # Keep this comment to allow automatic replacement of prek version + default: "0.0.28" # Keep this comment to allow automatic replacement of prek version skip-prek-hooks: description: "Skip some prek hooks from installation" default: "" diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 65215396c05..4be6b383d08 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -293,7 +293,7 @@ jobs: UPGRADE_PYTHON: "false" UPGRADE_GOLANG: "true" UPGRADE_PIP: "false" - UPGRADE_PREK: "false" + UPGRADE_PREK: "true" UPGRADE_NODE_LTS: "false" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Run automated upgrade for important versions minus uv(failing if needed)" @@ -307,7 +307,7 @@ jobs: UPGRADE_PYTHON: "true" UPGRADE_GOLANG: "false" UPGRADE_PIP: "true" - UPGRADE_PREK: "true" + UPGRADE_PREK: "false" UPGRADE_NODE_LTS: "true" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-amd.yml b/.github/workflows/ci-amd.yml index b7dfe3b37a2..d3ba08927d2 100644 --- a/.github/workflows/ci-amd.yml +++ b/.github/workflows/ci-amd.yml @@ -168,8 +168,8 @@ jobs: PR_LABELS: ${{ steps.source-run-info.outputs.pr-labels }} GITHUB_CONTEXT: ${{ toJson(github) }} - run-pin-versions-prek: - name: "Run pin-versions prek" + run-pin-versions-hook: + name: "Run pin-versions hook" needs: [build-info] runs-on: ${{ fromJSON(needs.build-info.outputs.amd-runners) }} steps: @@ -186,7 +186,7 @@ jobs: shell: bash env: UV_VERSION: "0.8.11" # Keep this comment to allow automatic replacement of uv version - PREK_VERSION: "0.0.27" # Keep this comment to allow automatic replacement of prek version + PREK_VERSION: "0.0.28" # 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} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 798c2ca2ec2..4ac71021448 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,7 +20,7 @@ default_language_version: python: python3 node: 22.18.0 golang: 1.24.0 -minimum_prek_version: '0.0.26' +minimum_prek_version: '0.0.28' exclude: ^.*/.*_vendor/ repos: - repo: meta diff --git a/Dockerfile.ci b/Dockerfile.ci index dda2c2203c7..f761cf4e4c8 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1446,7 +1446,7 @@ ARG AIRFLOW_PIP_VERSION=25.2 ARG AIRFLOW_SETUPTOOLS_VERSION=80.9.0 ARG AIRFLOW_UV_VERSION=0.8.11 # TODO(potiuk): automate with upgrade check (possibly) -ARG AIRFLOW_PREK_VERSION="0.0.27" +ARG AIRFLOW_PREK_VERSION="0.0.28" ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \ AIRFLOW_SETUPTOOLS_VERSION=${AIRFLOW_SETUPTOOLS_VERSION} \ diff --git a/dev/breeze/README.md b/dev/breeze/README.md index 540428a64ee..a07896d9e59 100644 --- a/dev/breeze/README.md +++ b/dev/breeze/README.md @@ -135,6 +135,6 @@ PLEASE DO NOT MODIFY THE HASH BELOW! IT IS AUTOMATICALLY UPDATED BY PREK. --------------------------------------------------------------------------------------------------------- -Package config hash: f7538d369c430a85cf62ca690d2440413a7fd402aad414c9b5a571b42dc19bb2cf5c430287f30849a92a0e1849bc6353812d6cec1b92c0ec4cfc12f5273e35d1 +Package config hash: 44115f7de7eedfe3274fc6754082b2d9c2a1a3e7600368186e28beca9ff2d92e1c8b339bb95107389e76c24993b23d94c14b73b06480e70a99da247a26f5b721 --------------------------------------------------------------------------------------------------------- diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md index b92610d74a6..b5abab52370 100644 --- a/dev/breeze/doc/ci/02_images.md +++ b/dev/breeze/doc/ci/02_images.md @@ -444,7 +444,7 @@ can be used for CI images: | `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.27` | `prek` version used. | +| `AIRFLOW_PREK_VERSION` | `0.0.28` | `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/pyproject.toml b/dev/breeze/pyproject.toml index 45a955167c4..14c158465aa 100644 --- a/dev/breeze/pyproject.toml +++ b/dev/breeze/pyproject.toml @@ -60,7 +60,7 @@ dependencies = [ "jinja2>=3.1.5", "jsonschema>=4.19.1", "packaging>=23.2", - "prek>=0.0.27", + "prek>=0.0.28", "psutil>=5.9.6", "pygithub>=2.1.1", "pytest-xdist>=3.3.1", 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 a869bc35a1b..63bf4a15452 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -249,7 +249,7 @@ AIRFLOW_UV_VERSION = "0.8.11" AIRFLOW_USE_UV = False GITPYTHON_VERSION = "3.1.45" RICH_VERSION = "14.1.0" -PREK_VERSION = "0.0.27" +PREK_VERSION = "0.0.28" HATCH_VERSION = "1.14.1" PYYAML_VERSION = "6.0.2"
