diff --git a/providers/arangodb/pyproject.toml b/providers/arangodb/pyproject.toml index 61bf1175cf4a3..be286d7dc508e 100644 --- a/providers/arangodb/pyproject.toml +++ b/providers/arangodb/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 "python-arango>=7.3.2", ] @@ -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/arangodb/src/airflow/providers/arangodb/hooks/arangodb.py b/providers/arangodb/src/airflow/providers/arangodb/hooks/arangodb.py index 349613a52326b..358abdd3102b2 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/hooks/arangodb.py +++ b/providers/arangodb/src/airflow/providers/arangodb/hooks/arangodb.py @@ -32,7 +32,7 @@ ) from airflow.exceptions import AirflowException -from airflow.providers.arangodb.version_compat import BaseHook +from airflow.providers.common.compat.sdk import BaseHook if TYPE_CHECKING: from arango.database import StandardDatabase diff --git a/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py b/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py index 570a1666676c5..a1f629d34924b 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py +++ b/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py @@ -22,14 +22,10 @@ from airflow.exceptions import AirflowException from airflow.providers.arangodb.hooks.arangodb import ArangoDBHook -from airflow.providers.arangodb.version_compat import BaseOperator +from airflow.providers.common.compat.sdk import BaseOperator if TYPE_CHECKING: - try: - from airflow.sdk.definitions.context import Context - except ImportError: - # TODO: Remove once provider drops support for Airflow 2 - from airflow.utils.context import Context + from airflow.providers.common.compat.sdk import Context class AQLOperator(BaseOperator): diff --git a/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py b/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py index 4221b92499642..539d82551065d 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py +++ b/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py @@ -21,14 +21,10 @@ from typing import TYPE_CHECKING from airflow.providers.arangodb.hooks.arangodb import ArangoDBHook -from airflow.providers.arangodb.version_compat import BaseSensorOperator +from airflow.providers.common.compat.sdk import BaseSensorOperator if TYPE_CHECKING: - try: - from airflow.sdk.definitions.context import Context - except ImportError: - # TODO: Remove once provider drops support for Airflow 2 - from airflow.utils.context import Context + from airflow.providers.common.compat.sdk import Context class AQLSensor(BaseSensorOperator): diff --git a/providers/arangodb/src/airflow/providers/arangodb/version_compat.py b/providers/arangodb/src/airflow/providers/arangodb/version_compat.py index 03bf6973a704b..a4fae50317e81 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/version_compat.py +++ b/providers/arangodb/src/airflow/providers/arangodb/version_compat.py @@ -35,21 +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] - -if AIRFLOW_V_3_0_PLUS: - from airflow.sdk import BaseOperator, BaseSensorOperator -else: - from airflow.models import BaseOperator - from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef] - __all__ = [ "AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", - "BaseHook", - "BaseOperator", - "BaseSensorOperator", ]