diff --git a/providers/segment/pyproject.toml b/providers/segment/pyproject.toml index d48ad31958ab0..88dca1c40d98f 100644 --- a/providers/segment/pyproject.toml +++ b/providers/segment/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 # segment-analytics-python is in mantaincnce mode. # Review changing to https://github.com/segmentio/public-api-sdk-python when ready? (currently in beta) "segment-analytics-python>=2.3.0", @@ -68,6 +69,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/segment/src/airflow/providers/segment/hooks/segment.py b/providers/segment/src/airflow/providers/segment/hooks/segment.py index 8928e1968f95d..a39e7d3df983a 100644 --- a/providers/segment/src/airflow/providers/segment/hooks/segment.py +++ b/providers/segment/src/airflow/providers/segment/hooks/segment.py @@ -27,7 +27,7 @@ import segment.analytics as analytics from airflow.exceptions import AirflowException -from airflow.providers.segment.version_compat import BaseHook +from airflow.providers.common.compat.sdk import BaseHook class SegmentHook(BaseHook): diff --git a/providers/segment/src/airflow/providers/segment/operators/segment_track_event.py b/providers/segment/src/airflow/providers/segment/operators/segment_track_event.py index d888da753be64..3e853177214e3 100644 --- a/providers/segment/src/airflow/providers/segment/operators/segment_track_event.py +++ b/providers/segment/src/airflow/providers/segment/operators/segment_track_event.py @@ -20,11 +20,11 @@ from collections.abc import Sequence from typing import TYPE_CHECKING +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.segment.hooks.segment import SegmentHook -from airflow.providers.segment.version_compat import BaseOperator if TYPE_CHECKING: - from airflow.providers.segment.version_compat import Context + from airflow.providers.common.compat.sdk import Context class SegmentTrackEventOperator(BaseOperator): diff --git a/providers/segment/src/airflow/providers/segment/version_compat.py b/providers/segment/src/airflow/providers/segment/version_compat.py index 75318bdbe64bc..a4fae50317e81 100644 --- a/providers/segment/src/airflow/providers/segment/version_compat.py +++ b/providers/segment/src/airflow/providers/segment/version_compat.py @@ -35,22 +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_0_PLUS: - from airflow.sdk import BaseOperator - from airflow.sdk.definitions.context import Context -else: - from airflow.models import BaseOperator - from airflow.utils.context import Context - -if AIRFLOW_V_3_1_PLUS: - from airflow.sdk import BaseHook -else: - from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef] - -# Explicitly export these imports to protect them from being removed by linters __all__ = [ "AIRFLOW_V_3_0_PLUS", - "BaseHook", - "BaseOperator", - "Context", + "AIRFLOW_V_3_1_PLUS", ]