diff --git a/airflow-core/tests/unit/always/test_project_structure.py b/airflow-core/tests/unit/always/test_project_structure.py index 1f55eac96be6e..798cc54756bc6 100644 --- a/airflow-core/tests/unit/always/test_project_structure.py +++ b/airflow-core/tests/unit/always/test_project_structure.py @@ -96,6 +96,7 @@ def test_providers_modules_should_have_tests(self): "providers/apache/livy/tests/unit/apache/livy/test_version_compat.py", "providers/apache/spark/tests/unit/apache/spark/test_version_compat.py", "providers/arangodb/tests/unit/arangodb/test_version_compat.py", + "providers/asana/tests/unit/asana/test_version_compat.py", "providers/atlassian/jira/tests/unit/atlassian/jira/test_version_compat.py", "providers/celery/tests/unit/celery/executors/test_celery_executor_utils.py", "providers/celery/tests/unit/celery/executors/test_default_celery.py", diff --git a/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py b/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py index 50a3421dfe73d..570a1666676c5 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py +++ b/providers/arangodb/src/airflow/providers/arangodb/operators/arangodb.py @@ -21,8 +21,8 @@ from typing import TYPE_CHECKING, Any from airflow.exceptions import AirflowException -from airflow.models import BaseOperator from airflow.providers.arangodb.hooks.arangodb import ArangoDBHook +from airflow.providers.arangodb.version_compat import BaseOperator if TYPE_CHECKING: try: diff --git a/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py b/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py index 8ad897b69e42e..4221b92499642 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py +++ b/providers/arangodb/src/airflow/providers/arangodb/sensors/arangodb.py @@ -21,12 +21,7 @@ from typing import TYPE_CHECKING from airflow.providers.arangodb.hooks.arangodb import ArangoDBHook -from airflow.providers.arangodb.version_compat import AIRFLOW_V_3_0_PLUS - -if AIRFLOW_V_3_0_PLUS: - from airflow.sdk import BaseSensorOperator -else: - from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef] +from airflow.providers.arangodb.version_compat import BaseSensorOperator if TYPE_CHECKING: try: diff --git a/providers/arangodb/src/airflow/providers/arangodb/version_compat.py b/providers/arangodb/src/airflow/providers/arangodb/version_compat.py index 48d122b669696..b326387fea2a1 100644 --- a/providers/arangodb/src/airflow/providers/arangodb/version_compat.py +++ b/providers/arangodb/src/airflow/providers/arangodb/version_compat.py @@ -33,3 +33,15 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]: AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0) + +if AIRFLOW_V_3_0_PLUS: + from airflow.sdk import BaseOperator, BaseSensorOperator +else: + from airflow.models import BaseOperator + from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef] + +__all__ = [ + "AIRFLOW_V_3_0_PLUS", + "BaseOperator", + "BaseSensorOperator", +] diff --git a/providers/asana/src/airflow/providers/asana/operators/asana_tasks.py b/providers/asana/src/airflow/providers/asana/operators/asana_tasks.py index 04a44bed9cfb0..35e0999d91bf5 100644 --- a/providers/asana/src/airflow/providers/asana/operators/asana_tasks.py +++ b/providers/asana/src/airflow/providers/asana/operators/asana_tasks.py @@ -19,8 +19,8 @@ from typing import TYPE_CHECKING -from airflow.models import BaseOperator from airflow.providers.asana.hooks.asana import AsanaHook +from airflow.providers.asana.version_compat import BaseOperator if TYPE_CHECKING: try: diff --git a/providers/asana/src/airflow/providers/asana/version_compat.py b/providers/asana/src/airflow/providers/asana/version_compat.py new file mode 100644 index 0000000000000..78cd58dd016ab --- /dev/null +++ b/providers/asana/src/airflow/providers/asana/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", +]