This is an automated email from the ASF dual-hosted git repository.

eladkal 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 d4e65c39e1b Moving BaseHook usages to version_compat for pagerduty 
(#52946)
d4e65c39e1b is described below

commit d4e65c39e1b660721a37b475fc44f073193aebb7
Author: Amogh Desai <[email protected]>
AuthorDate: Mon Jul 7 08:33:44 2025 +0530

    Moving BaseHook usages to version_compat for pagerduty (#52946)
---
 .../airflow/providers/pagerduty/hooks/pagerduty.py |  6 +--
 .../providers/pagerduty/hooks/pagerduty_events.py  |  6 +--
 .../airflow/providers/pagerduty/version_compat.py  | 47 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git 
a/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty.py 
b/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty.py
index ed6a8e4f0bb..5b69ff03455 100644
--- a/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty.py
+++ b/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty.py
@@ -24,11 +24,7 @@ from typing import Any
 import pagerduty
 
 from airflow.exceptions import AirflowException
-
-try:
-    from airflow.sdk import BaseHook
-except ImportError:
-    from airflow.hooks.base import BaseHook  # type: 
ignore[attr-defined,no-redef]
+from airflow.providers.pagerduty.version_compat import BaseHook
 
 
 class PagerdutyHook(BaseHook):
diff --git 
a/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty_events.py 
b/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty_events.py
index f6338a9b3f8..ef21db4b8a3 100644
--- 
a/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty_events.py
+++ 
b/providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty_events.py
@@ -24,11 +24,7 @@ from typing import TYPE_CHECKING, Any
 import pagerduty
 
 from airflow.exceptions import AirflowException
-
-try:
-    from airflow.sdk import BaseHook
-except ImportError:
-    from airflow.hooks.base import BaseHook  # type: 
ignore[attr-defined,no-redef]
+from airflow.providers.pagerduty.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from datetime import datetime
diff --git 
a/providers/pagerduty/src/airflow/providers/pagerduty/version_compat.py 
b/providers/pagerduty/src/airflow/providers/pagerduty/version_compat.py
new file mode 100644
index 00000000000..465da77d0d9
--- /dev/null
+++ b/providers/pagerduty/src/airflow/providers/pagerduty/version_compat.py
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# NOTE! THIS FILE IS COPIED MANUALLY IN OTHER PROVIDERS DELIBERATELY TO AVOID 
ADDING UNNECESSARY
+# DEPENDENCIES BETWEEN PROVIDERS. IF YOU WANT TO ADD CONDITIONAL CODE IN YOUR 
PROVIDER THAT DEPENDS
+# ON AIRFLOW VERSION, PLEASE COPY THIS FILE TO THE ROOT PACKAGE OF YOUR 
PROVIDER AND IMPORT
+# THOSE CONSTANTS FROM IT RATHER THAN IMPORTING THEM FROM ANOTHER PROVIDER OR 
TEST CODE
+#
+from __future__ import annotations
+
+
+def get_base_airflow_version_tuple() -> tuple[int, int, int]:
+    from packaging.version import Version
+
+    from airflow import __version__
+
+    airflow_version = Version(__version__)
+    return airflow_version.major, airflow_version.minor, airflow_version.micro
+
+
+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]
+
+__all__ = [
+    "AIRFLOW_V_3_0_PLUS",
+    "AIRFLOW_V_3_1_PLUS",
+    "BaseHook",
+]

Reply via email to