This is an automated email from the ASF dual-hosted git repository.
jasonliu 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 c09f02de555 Update celery provider conf imports to use common compat
SDK (#64134)
c09f02de555 is described below
commit c09f02de555049e36ba45a3a554d3e59dfa4ca52
Author: Aaron Chen <[email protected]>
AuthorDate: Mon Mar 23 23:23:31 2026 -0700
Update celery provider conf imports to use common compat SDK (#64134)
* Update celery provider conf imports to use common compat SDK
* Keep cli files using airflow.configuration.conf
---
.../src/airflow/providers/celery/executors/celery_executor.py | 2 +-
.../src/airflow/providers/celery/executors/celery_executor_utils.py | 6 +++---
.../providers/celery/executors/celery_kubernetes_executor.py | 2 +-
.../celery/src/airflow/providers/celery/executors/default_celery.py | 3 +--
providers/celery/tests/integration/celery/test_celery_executor.py | 3 +--
.../celery/tests/unit/celery/executors/test_celery_executor.py | 2 +-
.../tests/unit/celery/executors/test_celery_kubernetes_executor.py | 2 +-
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/providers/celery/src/airflow/providers/celery/executors/celery_executor.py
b/providers/celery/src/airflow/providers/celery/executors/celery_executor.py
index 53e7f069482..b31eec3b061 100644
--- a/providers/celery/src/airflow/providers/celery/executors/celery_executor.py
+++ b/providers/celery/src/airflow/providers/celery/executors/celery_executor.py
@@ -114,7 +114,7 @@ class CeleryExecutor(BaseExecutor):
# Can be removed when minimum supported provider version is equal to
the version of core airflow
# which introduces multi-team configuration (3.2+).
if not hasattr(self, "conf") or not hasattr(self.conf, "getint"):
- from airflow.configuration import conf as global_conf
+ from airflow.providers.common.compat.sdk import conf as global_conf
self.conf = global_conf
# Also set team_name to None if it doesn't exist, since the Celery app
creation expects it to be
diff --git
a/providers/celery/src/airflow/providers/celery/executors/celery_executor_utils.py
b/providers/celery/src/airflow/providers/celery/executors/celery_executor_utils.py
index 6f6e2b64d74..768f2d9dbf6 100644
---
a/providers/celery/src/airflow/providers/celery/executors/celery_executor_utils.py
+++
b/providers/celery/src/airflow/providers/celery/executors/celery_executor_utils.py
@@ -41,10 +41,9 @@ from celery.backends.database import DatabaseBackend, Task
as TaskDb, retry, ses
from celery.signals import import_modules as celery_import_modules,
worker_ready
from sqlalchemy import select
-from airflow.configuration import AirflowConfigParser, conf
from airflow.executors.base_executor import BaseExecutor
from airflow.providers.celery.version_compat import AIRFLOW_V_3_0_PLUS,
AIRFLOW_V_3_2_PLUS
-from airflow.providers.common.compat.sdk import AirflowException,
AirflowTaskTimeout, Stats, timeout
+from airflow.providers.common.compat.sdk import AirflowException,
AirflowTaskTimeout, Stats, conf, timeout
from airflow.utils.log.logging_mixin import LoggingMixin
from airflow.utils.net import get_hostname
from airflow.utils.providers_configuration_loader import
providers_configuration_loaded
@@ -69,6 +68,7 @@ if TYPE_CHECKING:
from celery.result import AsyncResult
+ from airflow.configuration import AirflowConfigParser
from airflow.executors import workloads
from airflow.executors.base_executor import EventBufferValueType,
ExecutorConf
from airflow.executors.workloads.types import WorkloadKey
@@ -191,8 +191,8 @@ def on_celery_worker_ready(*args, **kwargs):
def execute_workload(input: str) -> None:
from pydantic import TypeAdapter
- from airflow.configuration import conf
from airflow.executors import workloads
+ from airflow.providers.common.compat.sdk import conf
from airflow.sdk.execution_time.supervisor import supervise
decoder = TypeAdapter[workloads.All](workloads.All)
diff --git
a/providers/celery/src/airflow/providers/celery/executors/celery_kubernetes_executor.py
b/providers/celery/src/airflow/providers/celery/executors/celery_kubernetes_executor.py
index 9d55cda5376..687f7b75e3d 100644
---
a/providers/celery/src/airflow/providers/celery/executors/celery_kubernetes_executor.py
+++
b/providers/celery/src/airflow/providers/celery/executors/celery_kubernetes_executor.py
@@ -23,10 +23,10 @@ from typing import TYPE_CHECKING, Any
from deprecated import deprecated
-from airflow.configuration import conf
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.executors.base_executor import BaseExecutor
from airflow.providers.celery.executors.celery_executor import
AIRFLOW_V_3_0_PLUS, CeleryExecutor
+from airflow.providers.common.compat.sdk import conf
from airflow.utils.providers_configuration_loader import
providers_configuration_loaded
if TYPE_CHECKING:
diff --git
a/providers/celery/src/airflow/providers/celery/executors/default_celery.py
b/providers/celery/src/airflow/providers/celery/executors/default_celery.py
index c11b7e91948..52ef77a15ac 100644
--- a/providers/celery/src/airflow/providers/celery/executors/default_celery.py
+++ b/providers/celery/src/airflow/providers/celery/executors/default_celery.py
@@ -25,10 +25,9 @@ import re
import ssl
from typing import Any
-from airflow.configuration import conf
from airflow.exceptions import AirflowConfigException
from airflow.providers.celery.version_compat import AIRFLOW_V_3_0_PLUS
-from airflow.providers.common.compat.sdk import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException, conf
log = logging.getLogger(__name__)
diff --git a/providers/celery/tests/integration/celery/test_celery_executor.py
b/providers/celery/tests/integration/celery/test_celery_executor.py
index da8ee15571b..5e05c74a7d6 100644
--- a/providers/celery/tests/integration/celery/test_celery_executor.py
+++ b/providers/celery/tests/integration/celery/test_celery_executor.py
@@ -40,12 +40,11 @@ from kubernetes.client import models as k8s
from uuid6 import uuid7
from airflow._shared.timezones import timezone
-from airflow.configuration import conf
from airflow.executors import workloads
from airflow.executors.workloads.task import TaskInstanceDTO
from airflow.models.dag import DAG
from airflow.models.taskinstance import TaskInstance
-from airflow.providers.common.compat.sdk import AirflowException,
AirflowTaskTimeout, TaskInstanceKey
+from airflow.providers.common.compat.sdk import AirflowException,
AirflowTaskTimeout, TaskInstanceKey, conf
from airflow.providers.standard.operators.bash import BashOperator
from airflow.sdk import BaseOperator
from airflow.utils.state import State
diff --git
a/providers/celery/tests/unit/celery/executors/test_celery_executor.py
b/providers/celery/tests/unit/celery/executors/test_celery_executor.py
index f5d34fb2916..27328a78d06 100644
--- a/providers/celery/tests/unit/celery/executors/test_celery_executor.py
+++ b/providers/celery/tests/unit/celery/executors/test_celery_executor.py
@@ -33,12 +33,12 @@ from celery import Celery
from celery.result import AsyncResult
from kombu.asynchronous import set_event_loop
-from airflow.configuration import conf
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.models.dag import DAG
from airflow.models.taskinstance import TaskInstance, TaskInstanceKey
from airflow.providers.celery.executors import celery_executor,
celery_executor_utils, default_celery
from airflow.providers.celery.executors.celery_executor import CeleryExecutor
+from airflow.providers.common.compat.sdk import conf
from airflow.utils.state import State
from tests_common.test_utils import db
diff --git
a/providers/celery/tests/unit/celery/executors/test_celery_kubernetes_executor.py
b/providers/celery/tests/unit/celery/executors/test_celery_kubernetes_executor.py
index f6a3333ac7d..000dcdf5ba6 100644
---
a/providers/celery/tests/unit/celery/executors/test_celery_kubernetes_executor.py
+++
b/providers/celery/tests/unit/celery/executors/test_celery_kubernetes_executor.py
@@ -22,10 +22,10 @@ from unittest import mock
import pytest
from airflow.callbacks.callback_requests import CallbackRequest,
DagCallbackRequest
-from airflow.configuration import conf
from airflow.providers.celery.executors.celery_executor import CeleryExecutor
from airflow.providers.celery.executors.celery_kubernetes_executor import
CeleryKubernetesExecutor
from airflow.providers.cncf.kubernetes.executors.kubernetes_executor import
KubernetesExecutor
+from airflow.providers.common.compat.sdk import conf
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
