Skip to content

Fix celery provider ImportError on airflow 3.2.x by gating ExecutorWorkload on 3.3+ #65752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ferruzzi merged 1 commit into from
Apr 24, 2026
+7 −5
Merged

Fix celery provider ImportError on airflow 3.2.x by gating ExecutorWorkload on 3.3+ #65752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions providers/celery/src/airflow/providers/celery/executors/celery_executor_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
AIRFLOW_V_3_0_PLUS,
AIRFLOW_V_3_1_9_PLUS,
AIRFLOW_V_3_2_PLUS,
AIRFLOW_V_3_3_PLUS,
)
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, Stats, conf, timeout
from airflow.utils.log.logging_mixin import LoggingMixin
Expand Down Expand Up @@ -204,8 +205,8 @@ def on_celery_worker_ready(*args, **kwargs):
# and deserialization for us.
@app.task(name="execute_workload")
def execute_workload(input: str) -> None:
if not AIRFLOW_V_3_2_PLUS:
return _execute_workload_pre_3_2(input)
if not AIRFLOW_V_3_3_PLUS:
return _execute_workload_pre_3_3(input)

from celery.exceptions import Ignore
from pydantic import TypeAdapter
Expand Down Expand Up @@ -235,8 +236,8 @@ def execute_workload(input: str) -> None:
raise


def _execute_workload_pre_3_2(input: str) -> None:
"""Fallback for Airflow < 3.2 which lacks BaseExecutor.run_workload()."""
def _execute_workload_pre_3_3(input: str) -> None:
"""Fallback for Airflow < 3.3 which lacks BaseExecutor.run_workload() and ExecutorWorkload."""
from celery.exceptions import Ignore
from pydantic import TypeAdapter

Expand Down
3 changes: 2 additions & 1 deletion providers/celery/src/airflow/providers/celery/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
AIRFLOW_V_3_1_9_PLUS = get_base_airflow_version_tuple() >= (3, 1, 9)
AIRFLOW_V_3_2_PLUS = get_base_airflow_version_tuple() >= (3, 2, 0)
AIRFLOW_V_3_3_PLUS = get_base_airflow_version_tuple() >= (3, 3, 0)

__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_9_PLUS", "AIRFLOW_V_3_2_PLUS"]
__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_9_PLUS", "AIRFLOW_V_3_2_PLUS", "AIRFLOW_V_3_3_PLUS"]
Loading