diff --git a/providers/apache/kylin/pyproject.toml b/providers/apache/kylin/pyproject.toml index 2ef60192296bb..26c2b4cb04f49 100644 --- a/providers/apache/kylin/pyproject.toml +++ b/providers/apache/kylin/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", "kylinpy>2.7.0", ] @@ -66,6 +67,7 @@ dev = [ "apache-airflow", "apache-airflow-task-sdk", "apache-airflow-devel-common", + "apache-airflow-providers-common-compat", # Additional devel dependencies (do not remove this line and add extra development dependencies) ] diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/hooks/kylin.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/hooks/kylin.py index 31a76ac1b1f1b..1caa7b083cf8e 100644 --- a/providers/apache/kylin/src/airflow/providers/apache/kylin/hooks/kylin.py +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/hooks/kylin.py @@ -20,11 +20,7 @@ from kylinpy import exceptions, kylinpy from airflow.exceptions import AirflowException - -try: - from airflow.sdk import BaseHook -except ImportError: - from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef] +from airflow.providers.common.compat.sdk import BaseHook class KylinHook(BaseHook): diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py index 7c2b317bffe7a..656dabc7e747c 100644 --- a/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py @@ -26,10 +26,10 @@ from airflow.exceptions import AirflowException from airflow.providers.apache.kylin.hooks.kylin import KylinHook -from airflow.providers.apache.kylin.version_compat import BaseOperator +from airflow.providers.common.compat.sdk import BaseOperator if TYPE_CHECKING: - from airflow.utils.context import Context + from airflow.providers.common.compat.sdk import Context class KylinCubeOperator(BaseOperator): diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py index e7a259afb357c..0956edd21112f 100644 --- a/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py @@ -34,12 +34,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 -else: - from airflow.models import BaseOperator - __all__ = [ "AIRFLOW_V_3_0_PLUS", - "BaseOperator", ]