This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v2-10-test by this push:
new e7990fe3495 Bump hatch version in breeze and prevent
"get-workflow-info" failure (#45041) (#45064)
e7990fe3495 is described below
commit e7990fe34957f61625d64a77fffe1dffeaa641b1
Author: Jarek Potiuk <[email protected]>
AuthorDate: Thu Dec 19 09:44:42 2024 +0100
Bump hatch version in breeze and prevent "get-workflow-info" failure
(#45041) (#45064)
We enabled dependabot to bump dependencies for various Python
requirements we have in Airflow and it found out that we have
pretty out-dated hatch - pinned because of metadata stability when
building packages. The update caused "get-workflow-info"
step in CI to fail because the "get-workflow-info" commmand
contained output from uv upgrading breeze while it was running.
This PR bumps the version manually to the latest version, also
it sets `SKIP_BREEZE_SELF_UPGRADE_CHECK` variable to true in the
`get-workflow-info` step - to prevent breeze from checking and
automatically upgrading itself.
This will not make future dependabot PRs to succeed, because
those PRs will not update hash of README file - so the PRs will
fail at the pre-commit stage, but at least it will be clear what
should be done to fix it.
Also a bit of cleanup has been done opportunistically:
* the TODO on flit automation can now be removed as we have
dependabot taking care about it automatically in both places
that we were supposed to automate
* the importlib_resources exclusions were only used for Python
< 3.9 and we are now >= 3.0 so we can remove it
---
.github/workflows/ci.yml | 3 +++
dev/breeze/README.md | 2 +-
dev/breeze/pyproject.toml | 13 ++-----------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4da5ca6c8ae..20dc962f1d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -150,12 +150,15 @@ jobs:
- name: "Get information about the Workflow"
id: source-run-info
run: breeze ci get-workflow-info 2>> ${GITHUB_OUTPUT}
+ env:
+ SKIP_BREEZE_SELF_UPGRADE_CHECK: "true"
- name: Selective checks
id: selective-checks
env:
PR_LABELS: "${{ steps.source-run-info.outputs.pr-labels }}"
COMMIT_REF: "${{ github.sha }}"
VERBOSE: "false"
+
run: breeze ci selective-check 2>> ${GITHUB_OUTPUT}
- name: env
run: printenv
diff --git a/dev/breeze/README.md b/dev/breeze/README.md
index 713bf7ce83f..201eded3079 100644
--- a/dev/breeze/README.md
+++ b/dev/breeze/README.md
@@ -66,6 +66,6 @@ PLEASE DO NOT MODIFY THE HASH BELOW! IT IS AUTOMATICALLY
UPDATED BY PRE-COMMIT.
---------------------------------------------------------------------------------------------------------
-Package config hash:
d1d07397099e14c5fc5f0b0e13a87ac8e112bf66755f77cee62b29151cd18c2f2d35932906db6b3885af652defddce696ef9b2df58e21bd3a7749bca82baf910
+Package config hash:
6895629f7608853a7a16464234a3fc643a0e97a719ad6bba6929c43a17f780d89c909d8c42d1eeefc7e02b427e39a48491af0b1346c2a959f3f2648340be74e4
---------------------------------------------------------------------------------------------------------
diff --git a/dev/breeze/pyproject.toml b/dev/breeze/pyproject.toml
index e7bdbb4db08..88358e302b7 100644
--- a/dev/breeze/pyproject.toml
+++ b/dev/breeze/pyproject.toml
@@ -53,20 +53,11 @@ dependencies = [
# It turns out that when packages are prepared metadata version in the
produced packages
# is taken from the front-end not from the backend, so in order to make
sure that the
# packages are reproducible, we should pin both backend in "build-system"
and frontend in
- # "dependencies" of the environment that is used to build the packages.
- #
- # TODO(potiuk): automate bumping the version of flit in breeze and sync it
with
- # the version in the template for provider packages with pre-commit also
add instructions in
- # the source packages explaining that reproducibility can only be achieved
by using the same
- # version of flit front-end to build the package
- #
+ # "dependencies" of the environment that is used to build the packages
"flit==3.10.1",
"flit-core==3.10.1",
"gitpython>=3.1.40",
- "hatch==1.9.4",
- # Importib_resources 6.2.0-6.3.1 break pytest_rewrite
- # see https://github.com/python/importlib_resources/issues/299
- "importlib_resources>=5.2,!=6.2.0,!=6.3.0,!=6.3.1;python_version<\"3.9\"",
+ "hatch==1.14.0",
"inputimeout>=1.0.4",
"jinja2>=3.1.0",
"jsonschema>=4.19.1",
