diff --git a/providers/neo4j/pyproject.toml b/providers/neo4j/pyproject.toml index 9134e1ca87ace..a227d8ac5ee36 100644 --- a/providers/neo4j/pyproject.toml +++ b/providers/neo4j/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", "neo4j>=5.20.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/neo4j/src/airflow/providers/neo4j/operators/neo4j.py b/providers/neo4j/src/airflow/providers/neo4j/operators/neo4j.py index 96a6ec3648d79..136b3175253e4 100644 --- a/providers/neo4j/src/airflow/providers/neo4j/operators/neo4j.py +++ b/providers/neo4j/src/airflow/providers/neo4j/operators/neo4j.py @@ -20,8 +20,8 @@ from collections.abc import Sequence from typing import TYPE_CHECKING, Any +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.neo4j.hooks.neo4j import Neo4jHook -from airflow.providers.neo4j.version_compat import BaseOperator if TYPE_CHECKING: try: diff --git a/providers/neo4j/src/airflow/providers/neo4j/version_compat.py b/providers/neo4j/src/airflow/providers/neo4j/version_compat.py index e7a259afb357c..0956edd21112f 100644 --- a/providers/neo4j/src/airflow/providers/neo4j/version_compat.py +++ b/providers/neo4j/src/airflow/providers/neo4j/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", ]