diff --git a/providers/zendesk/pyproject.toml b/providers/zendesk/pyproject.toml index 1256c7e27b2f0..e144c48e0b0e7 100644 --- a/providers/zendesk/pyproject.toml +++ b/providers/zendesk/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.7.4", # + TODO: bump to next version "zenpy>=2.0.40", ] @@ -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/zendesk/src/airflow/providers/zendesk/hooks/zendesk.py b/providers/zendesk/src/airflow/providers/zendesk/hooks/zendesk.py index 9c429dfa75398..dc8936ad69393 100644 --- a/providers/zendesk/src/airflow/providers/zendesk/hooks/zendesk.py +++ b/providers/zendesk/src/airflow/providers/zendesk/hooks/zendesk.py @@ -21,7 +21,7 @@ from zenpy import Zenpy -from airflow.providers.zendesk.version_compat import BaseHook +from airflow.providers.common.compat.sdk import BaseHook if TYPE_CHECKING: from zenpy.lib.api import BaseApi diff --git a/providers/zendesk/src/airflow/providers/zendesk/version_compat.py b/providers/zendesk/src/airflow/providers/zendesk/version_compat.py index 86366255bdf55..77f064add3732 100644 --- a/providers/zendesk/src/airflow/providers/zendesk/version_compat.py +++ b/providers/zendesk/src/airflow/providers/zendesk/version_compat.py @@ -31,21 +31,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]: AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0) -if AIRFLOW_V_3_1_PLUS: - from airflow.sdk import BaseHook -else: - from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef] - - -if AIRFLOW_V_3_0_PLUS: - from airflow.sdk import BaseOperator -else: - from airflow.models import BaseOperator - - __all__ = [ "AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", - "BaseHook", - "BaseOperator", ]