diff --git a/providers/apache/druid/pyproject.toml b/providers/apache/druid/pyproject.toml index 9eb64fff9ef46..996b5bdcc2c48 100644 --- a/providers/apache/druid/pyproject.toml +++ b/providers/apache/druid/pyproject.toml @@ -68,6 +68,9 @@ dependencies = [ "apache.hive" = [ "apache-airflow-providers-apache-hive" ] +"common.compat" = [ + "apache-airflow-providers-common-compat" +] [dependency-groups] dev = [ diff --git a/providers/dingding/pyproject.toml b/providers/dingding/pyproject.toml index 69cf8d26c4562..1e0045b4311b6 100644 --- a/providers/dingding/pyproject.toml +++ b/providers/dingding/pyproject.toml @@ -58,6 +58,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.10.0", + "apache-airflow-providers-common-compat>=1.8.0", "apache-airflow-providers-http", ] @@ -66,6 +67,7 @@ dev = [ "apache-airflow", "apache-airflow-task-sdk", "apache-airflow-devel-common", + "apache-airflow-providers-common-compat", "apache-airflow-providers-http", # Additional devel dependencies (do not remove this line and add extra development dependencies) ] diff --git a/providers/dingding/src/airflow/providers/dingding/operators/dingding.py b/providers/dingding/src/airflow/providers/dingding/operators/dingding.py index 642b21093a514..57187018e2a5e 100644 --- a/providers/dingding/src/airflow/providers/dingding/operators/dingding.py +++ b/providers/dingding/src/airflow/providers/dingding/operators/dingding.py @@ -20,11 +20,11 @@ from collections.abc import Sequence from typing import TYPE_CHECKING +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.dingding.hooks.dingding import DingdingHook -from airflow.providers.dingding.version_compat import BaseOperator if TYPE_CHECKING: - from airflow.providers.dingding.version_compat import Context + from airflow.providers.common.compat.sdk import Context class DingdingOperator(BaseOperator): diff --git a/providers/dingding/src/airflow/providers/dingding/version_compat.py b/providers/dingding/src/airflow/providers/dingding/version_compat.py index c267288006129..ff0f446dc5efc 100644 --- a/providers/dingding/src/airflow/providers/dingding/version_compat.py +++ b/providers/dingding/src/airflow/providers/dingding/version_compat.py @@ -29,15 +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) -if AIRFLOW_V_3_0_PLUS: - from airflow.sdk import BaseOperator - from airflow.sdk.definitions.context import Context -else: - from airflow.models import BaseOperator - from airflow.utils.context import Context - __all__ = [ "AIRFLOW_V_3_0_PLUS", - "BaseOperator", - "Context", ]