From 4360dca3c10cc3916523f1f8787d21870bd1db46 Mon Sep 17 00:00:00 2001 From: Karen Braganza Date: Mon, 30 Jun 2025 17:11:35 -0400 Subject: [PATCH 1/2] Update influxdb BaseOperator imports for Airflow 3.0 compatibility --- .../providers/influxdb/operators/influxdb.py | 2 +- .../providers/influxdb/version_compat.py | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 providers/influxdb/src/airflow/providers/influxdb/version_compat.py diff --git a/providers/influxdb/src/airflow/providers/influxdb/operators/influxdb.py b/providers/influxdb/src/airflow/providers/influxdb/operators/influxdb.py index 6c3cba0b14394..62e9b75bcc9af 100644 --- a/providers/influxdb/src/airflow/providers/influxdb/operators/influxdb.py +++ b/providers/influxdb/src/airflow/providers/influxdb/operators/influxdb.py @@ -20,8 +20,8 @@ from collections.abc import Sequence from typing import TYPE_CHECKING -from airflow.models import BaseOperator from airflow.providers.influxdb.hooks.influxdb import InfluxDBHook +from airflow.providers.influxdb.version_compat import BaseOperator if TYPE_CHECKING: try: diff --git a/providers/influxdb/src/airflow/providers/influxdb/version_compat.py b/providers/influxdb/src/airflow/providers/influxdb/version_compat.py new file mode 100644 index 0000000000000..9e99cafacafa1 --- /dev/null +++ b/providers/influxdb/src/airflow/providers/influxdb/version_compat.py @@ -0,0 +1,37 @@ +# 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 e9781daf7c5b53714f0bed5e12b595eee6ea2b6f Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Tue, 1 Jul 2025 12:08:47 +0530 Subject: [PATCH 2/2] Apply suggestions from code review --- .../influxdb/src/airflow/providers/influxdb/version_compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/influxdb/src/airflow/providers/influxdb/version_compat.py b/providers/influxdb/src/airflow/providers/influxdb/version_compat.py index 9e99cafacafa1..ab72155414178 100644 --- a/providers/influxdb/src/airflow/providers/influxdb/version_compat.py +++ b/providers/influxdb/src/airflow/providers/influxdb/version_compat.py @@ -32,6 +32,6 @@ 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", "BaseOperator"]