From 23e8ac912483c9e16b17162ff6a0b48479786419 Mon Sep 17 00:00:00 2001 From: Jens Scheffler Date: Thu, 9 Oct 2025 23:29:40 +0200 Subject: [PATCH 1/3] Fix broken main after pydantic 2.12.0 - partly cleanup --- airflow-ctl/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow-ctl/pyproject.toml b/airflow-ctl/pyproject.toml index cfd95a458c510..c67967aeb096a 100644 --- a/airflow-ctl/pyproject.toml +++ b/airflow-ctl/pyproject.toml @@ -33,7 +33,7 @@ dependencies = [ "lazy-object-proxy>=1.2.0", "methodtools>=0.4.7", "platformdirs>=4.3.6", - "pydantic>=2.11.0,!=2.12.0", # https://github.com/apache/airflow/issues/56482 + "pydantic>=2.11.0", # https://github.com/apache/airflow/issues/56482 "rich-argparse>=1.0.0", "structlog>=25.2.0", "uuid6>=2024.7.10", @@ -121,7 +121,7 @@ dev = [ "apache-airflow-devel-common", ] codegen = [ - "datamodel-code-generator[http]==0.32.0", + "datamodel-code-generator[http]==0.33.0", "apache-airflow-devel-common" ] From 619d2666e8d1c1cac78f5b6555cd69a1e843ff0b Mon Sep 17 00:00:00 2001 From: Jens Scheffler Date: Thu, 9 Oct 2025 23:50:20 +0200 Subject: [PATCH 2/3] Fix broken main after pydantic 2.12.0 - partly cleanup, align task SDK as well --- task-sdk/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-sdk/pyproject.toml b/task-sdk/pyproject.toml index 22426d5b0f960..29203bc429200 100644 --- a/task-sdk/pyproject.toml +++ b/task-sdk/pyproject.toml @@ -154,7 +154,7 @@ exclude_also = [ [dependency-groups] codegen = [ - "datamodel-code-generator[http]==0.32.0", + "datamodel-code-generator[http]==0.33.0", "openapi-spec-validator>=0.7.1", "svcs>=25.1.0", "rich>=13.6.0", From 6350331f01e383152a79a7baf433e831e78b1f06 Mon Sep 17 00:00:00 2001 From: Jens Scheffler Date: Sun, 12 Oct 2025 02:05:07 +0200 Subject: [PATCH 3/3] Regenerate generated code --- airflow-ctl/src/airflowctl/api/datamodels/auth_generated.py | 2 +- airflow-ctl/src/airflowctl/api/datamodels/generated.py | 2 +- task-sdk/src/airflow/sdk/api/datamodels/_generated.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airflow-ctl/src/airflowctl/api/datamodels/auth_generated.py b/airflow-ctl/src/airflowctl/api/datamodels/auth_generated.py index 5eb02b4253353..0a100364599cd 100644 --- a/airflow-ctl/src/airflowctl/api/datamodels/auth_generated.py +++ b/airflow-ctl/src/airflowctl/api/datamodels/auth_generated.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: v2-simple-auth-manager-generated.yaml -# version: 0.32.0 +# version: 0.33.0 from __future__ import annotations diff --git a/airflow-ctl/src/airflowctl/api/datamodels/generated.py b/airflow-ctl/src/airflowctl/api/datamodels/generated.py index c965a5139a6c5..61a85d4e3b192 100644 --- a/airflow-ctl/src/airflowctl/api/datamodels/generated.py +++ b/airflow-ctl/src/airflowctl/api/datamodels/generated.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: v2-rest-api-generated.yaml -# version: 0.32.0 +# version: 0.33.0 from __future__ import annotations diff --git a/task-sdk/src/airflow/sdk/api/datamodels/_generated.py b/task-sdk/src/airflow/sdk/api/datamodels/_generated.py index 8e4c4207b2742..ba53f911216bd 100644 --- a/task-sdk/src/airflow/sdk/api/datamodels/_generated.py +++ b/task-sdk/src/airflow/sdk/api/datamodels/_generated.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: http://0.0.0.0:8080/execution/openapi.json -# version: 0.32.0 +# version: 0.33.0 # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file