diff --git a/providers/pinecone/pyproject.toml b/providers/pinecone/pyproject.toml index 049726df101da..93c114d9b77d3 100644 --- a/providers/pinecone/pyproject.toml +++ b/providers/pinecone/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", "pinecone>=7.0.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/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py index 07b16d84841d8..73a43f82770ec 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py +++ b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py @@ -26,7 +26,7 @@ from pinecone import Pinecone, PodSpec, PodType, ServerlessSpec -from airflow.providers.pinecone.version_compat import BaseHook +from airflow.providers.common.compat.sdk import BaseHook if TYPE_CHECKING: from pinecone import Vector diff --git a/providers/pinecone/src/airflow/providers/pinecone/operators/pinecone.py b/providers/pinecone/src/airflow/providers/pinecone/operators/pinecone.py index 9d2059c6b6381..bdabe4425234c 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/operators/pinecone.py +++ b/providers/pinecone/src/airflow/providers/pinecone/operators/pinecone.py @@ -21,8 +21,8 @@ from functools import cached_property from typing import TYPE_CHECKING, Any +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.pinecone.hooks.pinecone import PineconeHook -from airflow.providers.pinecone.version_compat import BaseOperator if TYPE_CHECKING: from pinecone import Vector diff --git a/providers/pinecone/src/airflow/providers/pinecone/version_compat.py b/providers/pinecone/src/airflow/providers/pinecone/version_compat.py index ad7b31ea7019e..fe3ccfcfd3d7a 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/version_compat.py +++ b/providers/pinecone/src/airflow/providers/pinecone/version_compat.py @@ -30,18 +30,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 -else: - from airflow.models import BaseOperator - __all__ = [ "AIRFLOW_V_3_0_PLUS", - "BaseHook", - "BaseOperator", + "AIRFLOW_V_3_1_PLUS", ]