This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new c8f2c967dbb Migrate `opsgenie` provider to `common.compat` (#57121)
c8f2c967dbb is described below
commit c8f2c967dbb9e3f360b9c58caa9c45e44832bce8
Author: Bhavani Ravi <[email protected]>
AuthorDate: Thu Oct 23 20:59:15 2025 +0530
Migrate `opsgenie` provider to `common.compat` (#57121)
part of: #57018
---
.../src/airflow/providers/opsgenie/hooks/opsgenie.py | 2 +-
.../src/airflow/providers/opsgenie/notifications/opsgenie.py | 7 +------
.../src/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 7f20d6c2e98..3c4a439a215 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 @@ from opsgenie_sdk import (
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 5e561c2a8bc..e577c237b73 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.common.compat.notifier import
BaseNotifier
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 27932f8be7a..edcb419bab9 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 __future__ import annotations
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 c2a90c12ccc..f5bb3ae555c 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"]
