From 728b47e850e6195d40ace1cbfe82d1f73a4fd4cf Mon Sep 17 00:00:00 2001 From: Bhavani Ravi Date: Thu, 23 Oct 2025 07:42:52 +0530 Subject: [PATCH] Migrate opsgenie provider to common.compat --- .../src/airflow/providers/opsgenie/hooks/opsgenie.py | 2 +- .../providers/opsgenie/notifications/opsgenie.py | 7 +------ .../airflow/providers/opsgenie/operators/opsgenie.py | 8 ++------ .../src/airflow/providers/opsgenie/version_compat.py | 12 +----------- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/providers/opsgenie/src/airflow/providers/opsgenie/hooks/opsgenie.py b/providers/opsgenie/src/airflow/providers/opsgenie/hooks/opsgenie.py index 7f20d6c2e987c..3c4a439a21516 100644 --- a/providers/opsgenie/src/airflow/providers/opsgenie/hooks/opsgenie.py +++ b/providers/opsgenie/src/airflow/providers/opsgenie/hooks/opsgenie.py @@ -29,7 +29,7 @@ SuccessResponse, ) -from airflow.providers.opsgenie.version_compat import BaseHook +from airflow.providers.common.compat.sdk import BaseHook class OpsgenieAlertHook(BaseHook): diff --git a/providers/opsgenie/src/airflow/providers/opsgenie/notifications/opsgenie.py b/providers/opsgenie/src/airflow/providers/opsgenie/notifications/opsgenie.py index 5e561c2a8bcdd..e577c237b73aa 100644 --- a/providers/opsgenie/src/airflow/providers/opsgenie/notifications/opsgenie.py +++ b/providers/opsgenie/src/airflow/providers/opsgenie/notifications/opsgenie.py @@ -25,14 +25,9 @@ from airflow.providers.opsgenie.hooks.opsgenie import OpsgenieAlertHook if TYPE_CHECKING: + from airflow.providers.common.compat.sdk import Context from airflow.providers.opsgenie.typing.opsgenie import CreateAlertPayload - 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 - class OpsgenieNotifier(BaseNotifier): """ diff --git a/providers/opsgenie/src/airflow/providers/opsgenie/operators/opsgenie.py b/providers/opsgenie/src/airflow/providers/opsgenie/operators/opsgenie.py index 27932f8be7aba..edcb419bab969 100644 --- a/providers/opsgenie/src/airflow/providers/opsgenie/operators/opsgenie.py +++ b/providers/opsgenie/src/airflow/providers/opsgenie/operators/opsgenie.py @@ -20,15 +20,11 @@ from collections.abc import Sequence from typing import TYPE_CHECKING, Any +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.opsgenie.hooks.opsgenie import OpsgenieAlertHook -from airflow.providers.opsgenie.version_compat 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 OpsgenieCreateAlertOperator(BaseOperator): diff --git a/providers/opsgenie/src/airflow/providers/opsgenie/version_compat.py b/providers/opsgenie/src/airflow/providers/opsgenie/version_compat.py index c2a90c12ccc4f..f5bb3ae555c1f 100644 --- a/providers/opsgenie/src/airflow/providers/opsgenie/version_compat.py +++ b/providers/opsgenie/src/airflow/providers/opsgenie/version_compat.py @@ -35,14 +35,4 @@ 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", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator"] +__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]