From 0a5c7e3345cc8bb7b7bc9a4ebbbf2a2998514731 Mon Sep 17 00:00:00 2001 From: Ankit Chaurasia <8670962+sunank200@users.noreply.github.com> Date: Tue, 1 Jul 2025 22:27:41 +0545 Subject: [PATCH 1/2] Move provider import compact to version_compat --- .../microsoft/winrm/operators/winrm.py | 2 +- .../microsoft/winrm/version_compat.py | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py diff --git a/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/operators/winrm.py b/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/operators/winrm.py index cfb0015b8ee72..8794139388865 100644 --- a/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/operators/winrm.py +++ b/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/operators/winrm.py @@ -24,8 +24,8 @@ from airflow.configuration import conf from airflow.exceptions import AirflowException -from airflow.models import BaseOperator from airflow.providers.microsoft.winrm.hooks.winrm import WinRMHook +from airflow.providers.microsoft.winrm.version_compat import BaseOperator if TYPE_CHECKING: from airflow.utils.context import Context diff --git a/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py b/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py new file mode 100644 index 0000000000000..78cd58dd016ab --- /dev/null +++ b/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py @@ -0,0 +1,40 @@ +# 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) + +if AIRFLOW_V_3_0_PLUS: + from airflow.sdk import BaseOperator +else: + from airflow.models import BaseOperator + +__all__ = [ + "AIRFLOW_V_3_0_PLUS", + "BaseOperator", +] From 7eb4d1676b7e8492dd92423c0e1acfd9276dd27b Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Tue, 1 Jul 2025 22:49:31 +0530 Subject: [PATCH 2/2] Apply suggestions from code review --- .../src/airflow/providers/microsoft/winrm/version_compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py b/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py index 78cd58dd016ab..89ade07a76753 100644 --- a/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py +++ b/providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/version_compat.py @@ -32,7 +32,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]: if AIRFLOW_V_3_0_PLUS: from airflow.sdk import BaseOperator else: - from airflow.models import BaseOperator + from airflow.models import BaseOperator # type: ignore[no-redef] __all__ = [ "AIRFLOW_V_3_0_PLUS",