This is an automated email from the ASF dual-hosted git repository.
shahar1 pushed a commit to branch airflow-ctl/v0-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/airflow-ctl/v0-1-test by this
push:
new f9cb14d33ae [airflow-ctl/v0-1-test] Require rich-argparse 1.4.0 for
airflowctl (#76661) (#76668)
f9cb14d33ae is described below
commit f9cb14d33ae70157e0a0943b74ff2059faa2441d
Author: Henry Chen <[email protected]>
AuthorDate: Sat Nov 7 17:15:16 2026 +0800
[airflow-ctl/v0-1-test] Require rich-argparse 1.4.0 for airflowctl (#76661)
(#76668)
airflowctl imports HelpPreviewAction at startup, which rich-argparse only
provides from 1.4.0. The declared floor of 1.0.0 lets a resolver keep an older
release, and then every airflowctl command fails with ImportError.
(cherry picked from commit cb3568622c2b727f12a28ac891e4947a660cd4e1)
Conflict resolution: this branch declares structlog>=25.4.0 where main has
>=26.1.0, and the two floors sit on adjacent lines, so the hunk conflicted.
Only the rich-argparse floor is taken; structlog keeps this branch's value.
uv.lock was regenerated with the uv version this branch pins (0.11.8) rather
than merged by hand, which leaves the same one-line specifier change as on
main.
Co-authored-by: Shahar Epstein <[email protected]>
---
airflow-ctl/pyproject.toml | 2 +-
uv.lock | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/airflow-ctl/pyproject.toml b/airflow-ctl/pyproject.toml
index 344eb42c9c9..6aece11af1a 100644
--- a/airflow-ctl/pyproject.toml
+++ b/airflow-ctl/pyproject.toml
@@ -38,7 +38,7 @@ dependencies = [
"platformdirs>=4.3.6",
"pydantic>=2.11.0", # https://github.com/apache/airflow/issues/56482
"pyyaml>=6.0.3",
- "rich-argparse>=1.0.0",
+ "rich-argparse>=1.4.0",
"structlog>=25.4.0",
"uuid6>=2024.7.10",
"tabulate>=0.9.0",
diff --git a/uv.lock b/uv.lock
index ee698b4c5a7..07cc16fc973 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2012,7 +2012,7 @@ requires-dist = [
{ name = "platformdirs", specifier = ">=4.3.6" },
{ name = "pydantic", specifier = ">=2.11.0" },
{ name = "pyyaml", specifier = ">=6.0.3" },
- { name = "rich-argparse", specifier = ">=1.0.0" },
+ { name = "rich-argparse", specifier = ">=1.4.0" },
{ name = "structlog", specifier = ">=25.4.0" },
{ name = "tabulate", specifier = ">=0.9.0" },
{ name = "tenacity", specifier = ">=9.1.4" },
