This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new c2feef6273a Remove marshmallow version restriction; update deprecated
usages (#45499)
c2feef6273a is described below
commit c2feef6273a427ad9b9f583d12e174388da41035
Author: Steven Loria <[email protected]>
AuthorDate: Wed Jan 8 19:27:23 2025 -0500
Remove marshmallow version restriction; update deprecated usages (#45499)
---
airflow/api_connexion/schemas/task_schema.py | 6 +++---
hatch_build.py | 3 ---
.../src/airflow/providers/amazon/aws/executors/ecs/boto_schema.py | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/airflow/api_connexion/schemas/task_schema.py
b/airflow/api_connexion/schemas/task_schema.py
index e78c3ef4af1..1329a351d7b 100644
--- a/airflow/api_connexion/schemas/task_schema.py
+++ b/airflow/api_connexion/schemas/task_schema.py
@@ -48,14 +48,14 @@ class TaskSchema(Schema):
)
depends_on_past = fields.Boolean(dump_only=True)
wait_for_downstream = fields.Boolean(dump_only=True)
- retries = fields.Number(dump_only=True)
+ retries = fields.Integer(dump_only=True)
queue = fields.String(dump_only=True)
pool = fields.String(dump_only=True)
- pool_slots = fields.Number(dump_only=True)
+ pool_slots = fields.Integer(dump_only=True)
execution_timeout = fields.Nested(TimeDeltaSchema, dump_only=True)
retry_delay = fields.Nested(TimeDeltaSchema, dump_only=True)
retry_exponential_backoff = fields.Boolean(dump_only=True)
- priority_weight = fields.Number(dump_only=True)
+ priority_weight = fields.Integer(dump_only=True)
weight_rule = WeightRuleField(dump_only=True)
ui_color = ColorField(dump_only=True)
ui_fgcolor = ColorField(dump_only=True)
diff --git a/hatch_build.py b/hatch_build.py
index a92c3f69a02..77e851fa932 100644
--- a/hatch_build.py
+++ b/hatch_build.py
@@ -402,9 +402,6 @@ DEPENDENCIES = [
"markdown-it-py>=2.1.0",
"markupsafe>=1.1.1",
"marshmallow-oneofschema>=2.0.1",
- # Marshmallow 3.24.0 introduced a breaking changes
- #
https://github.com/marshmallow-code/marshmallow/blob/dev/CHANGELOG.rst#3240-2025-01-06
- "marshmallow==3.23.3",
"mdit-py-plugins>=0.3.0",
"methodtools>=0.4.7",
"opentelemetry-api>=1.24.0",
diff --git
a/providers/src/airflow/providers/amazon/aws/executors/ecs/boto_schema.py
b/providers/src/airflow/providers/amazon/aws/executors/ecs/boto_schema.py
index c9e5d85fc4f..08306924678 100644
--- a/providers/src/airflow/providers/amazon/aws/executors/ecs/boto_schema.py
+++ b/providers/src/airflow/providers/amazon/aws/executors/ecs/boto_schema.py
@@ -56,7 +56,7 @@ class BotoTaskSchema(Schema):
last_status = fields.String(data_key="lastStatus", required=True)
desired_status = fields.String(data_key="desiredStatus", required=True)
containers = fields.List(fields.Nested(BotoContainerSchema), required=True)
- started_at = fields.Field(data_key="startedAt")
+ started_at = fields.Raw(data_key="startedAt")
stopped_reason = fields.String(data_key="stoppedReason")
@post_load
