From f098c1bb12a08a79f03af4883b0da3655ac5a642 Mon Sep 17 00:00:00 2001 From: Ahmad Farhan Date: Sat, 28 Jun 2025 10:35:00 +0100 Subject: [PATCH 1/3] Change BaseOperator for Apache TinkerPop --- .../apache/tinkerpop/operators/gremlin.py | 2 +- .../apache/tinkerpop/version_compat.py | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/version_compat.py diff --git a/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py index f7064890d5d4b..7a38a220d979e 100644 --- a/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py +++ b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py @@ -18,8 +18,8 @@ from typing import TYPE_CHECKING, Any -from airflow.models import BaseOperator from airflow.providers.apache.tinkerpop.hooks.gremlin import GremlinHook +from airflow.providers.apache.tinkerpop.version_compat import BaseOperator if TYPE_CHECKING: try: diff --git a/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/version_compat.py b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/version_compat.py new file mode 100644 index 0000000000000..9e99cafacafa1 --- /dev/null +++ b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/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 9efd044a0a15de6fdd34f3de84021998f09967bc Mon Sep 17 00:00:00 2001 From: Ahmad Farhan Date: Sat, 28 Jun 2025 10:35:00 +0100 Subject: [PATCH 2/3] Change BaseOperator for Apache TinkerPop --- .../apache/tinkerpop/operators/gremlin.py | 2 +- .../apache/tinkerpop/version_compat.py | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/version_compat.py diff --git a/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py index f7064890d5d4b..7a38a220d979e 100644 --- a/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py +++ b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/operators/gremlin.py @@ -18,8 +18,8 @@ from typing import TYPE_CHECKING, Any -from airflow.models import BaseOperator from airflow.providers.apache.tinkerpop.hooks.gremlin import GremlinHook +from airflow.providers.apache.tinkerpop.version_compat import BaseOperator if TYPE_CHECKING: try: diff --git a/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/version_compat.py b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/version_compat.py new file mode 100644 index 0000000000000..9e99cafacafa1 --- /dev/null +++ b/providers/apache/tinkerpop/src/airflow/providers/apache/tinkerpop/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 fa167e634414f412dff8f4bb90030822f6627ea7 Mon Sep 17 00:00:00 2001 From: Ahmad Farhan Date: Sun, 29 Jun 2025 09:56:45 +0100 Subject: [PATCH 3/3] add test path --- airflow-core/tests/unit/always/test_project_structure.py | 1 + 1 file changed, 1 insertion(+) diff --git a/airflow-core/tests/unit/always/test_project_structure.py b/airflow-core/tests/unit/always/test_project_structure.py index 31e6d64b6b3c6..fbe8434730fd5 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/pig/tests/unit/apache/pig/test_version_compat.py", "providers/apache/spark/tests/unit/apache/spark/test_version_compat.py", + "providers/apache/tinkerpop/tests/unit/apache/tinkerpop/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",