diff --git a/providers/cloudant/pyproject.toml b/providers/cloudant/pyproject.toml index 6911729ab59f4..95920a4d68629 100644 --- a/providers/cloudant/pyproject.toml +++ b/providers/cloudant/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 "ibmcloudant>=0.10.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/cloudant/src/airflow/providers/cloudant/hooks/cloudant.py b/providers/cloudant/src/airflow/providers/cloudant/hooks/cloudant.py index 1101abe9b1b33..f0c32119a690e 100644 --- a/providers/cloudant/src/airflow/providers/cloudant/hooks/cloudant.py +++ b/providers/cloudant/src/airflow/providers/cloudant/hooks/cloudant.py @@ -24,7 +24,7 @@ from ibmcloudant import CloudantV1, CouchDbSessionAuthenticator from airflow.exceptions import AirflowException -from airflow.providers.cloudant.version_compat import BaseHook +from airflow.providers.common.compat.sdk import BaseHook if TYPE_CHECKING: from airflow.models import Connection diff --git a/providers/cloudant/src/airflow/providers/cloudant/version_compat.py b/providers/cloudant/src/airflow/providers/cloudant/version_compat.py index 465da77d0d9cb..a4fae50317e81 100644 --- a/providers/cloudant/src/airflow/providers/cloudant/version_compat.py +++ b/providers/cloudant/src/airflow/providers/cloudant/version_compat.py @@ -35,13 +35,7 @@ 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_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] - __all__ = [ "AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", - "BaseHook", ]