This is an automated email from the ASF dual-hosted git repository.
amoghdesai 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 d3a26179f57 Move all BaseHook usages to version_compat in HashiCorp
(#52812)
d3a26179f57 is described below
commit d3a26179f57506554359dab576b1ce4a806d978c
Author: Ankit Chaurasia <[email protected]>
AuthorDate: Sun Jul 6 21:47:32 2025 +0545
Move all BaseHook usages to version_compat in HashiCorp (#52812)
Co-authored-by: Amogh Desai <[email protected]>
---
.../src/airflow/providers/hashicorp/hooks/vault.py | 6 +---
.../airflow/providers/hashicorp/version_compat.py | 38 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/providers/hashicorp/src/airflow/providers/hashicorp/hooks/vault.py
b/providers/hashicorp/src/airflow/providers/hashicorp/hooks/vault.py
index 957d5b7911a..1e7e67641fd 100644
--- a/providers/hashicorp/src/airflow/providers/hashicorp/hooks/vault.py
+++ b/providers/hashicorp/src/airflow/providers/hashicorp/hooks/vault.py
@@ -28,11 +28,7 @@ from
airflow.providers.hashicorp._internal_client.vault_client import (
DEFAULT_KV_ENGINE_VERSION,
_VaultClient,
)
-
-try:
- from airflow.sdk import BaseHook
-except ImportError:
- from airflow.hooks.base import BaseHook # type:
ignore[attr-defined,no-redef]
+from airflow.providers.hashicorp.version_compat import BaseHook
from airflow.utils.helpers import merge_dicts
if TYPE_CHECKING:
diff --git
a/providers/hashicorp/src/airflow/providers/hashicorp/version_compat.py
b/providers/hashicorp/src/airflow/providers/hashicorp/version_compat.py
new file mode 100644
index 00000000000..e0c33b57b73
--- /dev/null
+++ b/providers/hashicorp/src/airflow/providers/hashicorp/version_compat.py
@@ -0,0 +1,38 @@
+# 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.
+
+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__ = ["BaseHook"]
