diff --git a/providers/datadog/src/airflow/providers/datadog/hooks/datadog.py b/providers/datadog/src/airflow/providers/datadog/hooks/datadog.py index 1901471860402..090c3278a8fe8 100644 --- a/providers/datadog/src/airflow/providers/datadog/hooks/datadog.py +++ b/providers/datadog/src/airflow/providers/datadog/hooks/datadog.py @@ -23,11 +23,7 @@ from datadog import api, initialize # type: ignore[attr-defined] 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.datadog.version_compat import BaseHook from airflow.utils.log.logging_mixin import LoggingMixin diff --git a/providers/datadog/src/airflow/providers/datadog/version_compat.py b/providers/datadog/src/airflow/providers/datadog/version_compat.py index 52dee9e5be6f4..9ded405463d4c 100644 --- a/providers/datadog/src/airflow/providers/datadog/version_compat.py +++ b/providers/datadog/src/airflow/providers/datadog/version_compat.py @@ -33,6 +33,12 @@ 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] if AIRFLOW_V_3_0_PLUS: from airflow.sdk import BaseSensorOperator @@ -43,6 +49,8 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]: __all__ = [ "AIRFLOW_V_3_0_PLUS", + "AIRFLOW_V_3_1_PLUS", + "BaseHook", "BaseSensorOperator", "Context", ]