diff --git a/airflow-core/tests/unit/always/test_project_structure.py b/airflow-core/tests/unit/always/test_project_structure.py index 14d63b8b2116b..26b8ef2af864f 100644 --- a/airflow-core/tests/unit/always/test_project_structure.py +++ b/airflow-core/tests/unit/always/test_project_structure.py @@ -239,6 +239,7 @@ def test_providers_modules_should_have_tests(self): "providers/standard/tests/unit/standard/utils/test_sensor_helper.py", "providers/tableau/tests/unit/tableau/test_version_compat.py", "providers/trino/tests/unit/trino/test_version_compat.py", + "providers/weaviate/tests/unit/weaviate/test_version_compat.py", ] modules_files: list[pathlib.Path] = list( AIRFLOW_PROVIDERS_ROOT_PATH.glob("**/src/airflow/providers/**/*.py") diff --git a/providers/weaviate/src/airflow/providers/weaviate/operators/weaviate.py b/providers/weaviate/src/airflow/providers/weaviate/operators/weaviate.py index 1facdf77beb0d..793f0a1d4ac91 100644 --- a/providers/weaviate/src/airflow/providers/weaviate/operators/weaviate.py +++ b/providers/weaviate/src/airflow/providers/weaviate/operators/weaviate.py @@ -21,18 +21,14 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from airflow.models import BaseOperator from airflow.providers.weaviate.hooks.weaviate import WeaviateHook +from airflow.providers.weaviate.version_compat import BaseOperator if TYPE_CHECKING: import pandas as pd from weaviate.types import UUID - 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.weaviate.version_compat import Context class WeaviateIngestOperator(BaseOperator): diff --git a/providers/weaviate/src/airflow/providers/weaviate/version_compat.py b/providers/weaviate/src/airflow/providers/weaviate/version_compat.py new file mode 100644 index 0000000000000..c267288006129 --- /dev/null +++ b/providers/weaviate/src/airflow/providers/weaviate/version_compat.py @@ -0,0 +1,43 @@ +# 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 + from airflow.sdk.definitions.context import Context +else: + from airflow.models import BaseOperator + from airflow.utils.context import Context + +__all__ = [ + "AIRFLOW_V_3_0_PLUS", + "BaseOperator", + "Context", +]