apache-airflow-providers-yandex 4.1.0__tar.gz → 4.1.1rc1__tar.gz

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-yandex
-Version: 4.1.0
+Version: 4.1.1rc1
 Summary: Provider package apache-airflow-providers-yandex for Apache Airflow
 Keywords: airflow-provider,yandex,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
-Requires-Python: ~=3.9
+Requires-Python: ~=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -15,18 +15,17 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.10.0
+Requires-Dist: apache-airflow>=2.10.0rc1
 Requires-Dist: yandexcloud>=0.308.0
 Requires-Dist: yandex-query-client>=0.1.4
 Requires-Dist: apache-airflow-providers-common-compat ; extra == "common-compat"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-yandex/4.1.1/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-yandex/4.1.1
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -58,7 +57,7 @@ Provides-Extra: common-compat
 
 Package ``apache-airflow-providers-yandex``
 
-Release: ``4.1.0``
+Release: ``4.1.1``
 
 
 This package is for Yandex, including:
@@ -73,7 +72,7 @@ This is a provider package for ``yandex`` provider. All classes for this provide
 are in ``airflow.providers.yandex`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.1/>`_.
 
 Installation
 ------------
@@ -82,7 +81,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-yandex``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -115,5 +114,5 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.1/changelog.html>`_.
 

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-yandex``
 
-Release: ``4.1.0``
+Release: ``4.1.1``
 
 
 This package is for Yandex, including:
@@ -38,7 +38,7 @@ This is a provider package for ``yandex`` provider. All classes for this provide
 are in ``airflow.providers.yandex`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.1/>`_.
 
 Installation
 ------------
@@ -47,7 +47,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-yandex``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -80,4 +80,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.1/changelog.html>`_.

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/docs/changelog.rst

@@ -27,6 +27,19 @@
 Changelog
 ---------
 
+4.1.1
+.....
+
+Misc
+~~~~
+
+* ``Move 'BaseHook' implementation to task SDK (#51873)``
+* ``Provider Migration: Update yandex provider for Airflow 3.0 compatibility  (#52422)``
+* ``Drop support for Python 3.9 (#52072)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+
 4.1.0
 .....
 

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/docs/index.rst

@@ -81,7 +81,7 @@ This package is for Yandex, including:
     - `Yandex.Cloud <https://cloud.yandex.com/>`__
 
 
-Release: 4.1.0
+Release: 4.1.1
 
 Provider package
 ----------------
@@ -134,5 +134,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-yandex 4.1.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.0.tar.gz.sha512>`__)
-* `The apache-airflow-providers-yandex 4.1.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.0-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-yandex 4.1.1 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.1.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.1.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.1.tar.gz.sha512>`__)
+* `The apache-airflow-providers-yandex 4.1.1 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.1-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.1-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_yandex-4.1.1-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/provider.yaml

@@ -23,12 +23,13 @@ description: |
 
         - `Yandex.Cloud <https://cloud.yandex.com/>`__
 state: ready
-source-date-epoch: 1747134003
+source-date-epoch: 1751474658
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 4.1.1
   - 4.1.0
   - 4.0.3
   - 4.0.2

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-yandex"
-version = "4.1.0"
+version = "4.1.1rc1"
 description = "Provider package apache-airflow-providers-yandex for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -44,20 +44,19 @@ classifiers = [
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: System :: Monitoring",
 ]
-requires-python = "~=3.9"
+requires-python = "~=3.10"
 
 # The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
 # Make sure to run ``breeze static-checks --type update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
-    "apache-airflow>=2.10.0",
+    "apache-airflow>=2.10.0rc1",
     "yandexcloud>=0.308.0",
     "yandex-query-client>=0.1.4",
 ]
@@ -74,7 +73,6 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
-    "apache-airflow-providers-common-compat",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
     "responses>=0.25.0",
 ]
@@ -105,8 +103,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-yandex/4.1.0/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-yandex/4.1.1"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-yandex/4.1.1/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/src/airflow/providers/yandex/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "4.1.0"
+__version__ = "4.1.1"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/src/airflow/providers/yandex/hooks/yandex.py

@@ -20,7 +20,6 @@ from typing import Any
 
 import yandexcloud
 
-from airflow.hooks.base import BaseHook
 from airflow.providers.yandex.utils.credentials import (
     CredentialsType,
     get_credentials,
@@ -30,6 +29,11 @@ from airflow.providers.yandex.utils.defaults import conn_name_attr, conn_type, d
 from airflow.providers.yandex.utils.fields import get_field_from_extras
 from airflow.providers.yandex.utils.user_agent import provider_user_agent
 
+try:
+    from airflow.sdk import BaseHook
+except ImportError:
+    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
+
 
 class YandexCloudBaseHook(BaseHook):
     """

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/src/airflow/providers/yandex/links/yq.py

@@ -18,24 +18,11 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from airflow.providers.yandex.version_compat import BaseOperatorLink, XCom
+
 if TYPE_CHECKING:
-    from airflow.models import BaseOperator
     from airflow.models.taskinstancekey import TaskInstanceKey
-
-    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.common.compat.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models import XCom  # type: ignore[no-redef]
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
+    from airflow.providers.yandex.version_compat import BaseOperator, Context
 
 XCOM_WEBLINK_KEY = "web_link"
 
@@ -49,5 +36,5 @@ class YQLink(BaseOperatorLink):
         return XCom.get_value(key=XCOM_WEBLINK_KEY, ti_key=ti_key) or "https://yq.cloud.yandex.ru"
 
     @staticmethod
-    def persist(context: Context, task_instance: BaseOperator, web_link: str) -> None:
-        task_instance.xcom_push(context, key=XCOM_WEBLINK_KEY, value=web_link)
+    def persist(context: Context, web_link: str) -> None:
+        context["ti"].xcom_push(key=XCOM_WEBLINK_KEY, value=web_link)

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/src/airflow/providers/yandex/operators/dataproc.py

@@ -20,15 +20,11 @@ from collections.abc import Iterable, Sequence
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from airflow.models import BaseOperator
 from airflow.providers.yandex.hooks.dataproc import DataprocHook
+from airflow.providers.yandex.version_compat import BaseOperator
 
 if TYPE_CHECKING:
-    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.yandex.version_compat import Context
 
 
 @dataclass

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/src/airflow/providers/yandex/operators/yq.py

@@ -20,16 +20,12 @@ from collections.abc import Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
-from airflow.models import BaseOperator
 from airflow.providers.yandex.hooks.yq import YQHook
 from airflow.providers.yandex.links.yq import YQLink
+from airflow.providers.yandex.version_compat import BaseOperator
 
 if TYPE_CHECKING:
-    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.yandex.version_compat import Context
 
 
 class YQExecuteQueryOperator(BaseOperator):
@@ -84,7 +80,7 @@ class YQExecuteQueryOperator(BaseOperator):
 
         # pass to YQLink
         web_link = self.hook.compose_query_web_link(self.query_id)
-        YQLink.persist(context, self, web_link)
+        YQLink.persist(context, web_link)
 
         results = self.hook.wait_results(self.query_id)
         # forget query to avoid 'stop_query' in on_kill

apache_airflow_providers_yandex-4.1.1rc1/src/airflow/providers/yandex/version_compat.py

@@ -0,0 +1,48 @@
+# 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, BaseOperatorLink
+    from airflow.sdk.definitions.context import Context
+    from airflow.sdk.execution_time.xcom import XCom
+else:
+    from airflow.models import BaseOperator, XCom
+    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
+    from airflow.utils.context import Context
+
+
+__all__ = [
+    "AIRFLOW_V_3_0_PLUS",
+    "BaseOperator",
+    "BaseOperatorLink",
+    "Context",
+    "XCom",
+]

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/tests/unit/yandex/hooks/test_dataproc.py

@@ -21,6 +21,15 @@ from unittest import mock
 
 import pytest
 
+try:
+    import importlib.util
+
+    if not importlib.util.find_spec("airflow.sdk.bases.hook"):
+        raise ImportError
+
+    BASEHOOK_PATCH_PATH = "airflow.sdk.bases.hook.BaseHook"
+except ImportError:
+    BASEHOOK_PATCH_PATH = "airflow.hooks.base.BaseHook"
 yandexlcloud = pytest.importorskip("yandexcloud")
 
 from airflow.models import Connection  # noqa: E402
@@ -62,7 +71,7 @@ HAS_CREDENTIALS = OAUTH_TOKEN != "my_oauth_token"
 
 class TestYandexCloudDataprocHook:
     def _init_hook(self):
-        with mock.patch("airflow.hooks.base.BaseHook.get_connection") as mock_get_connection:
+        with mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection") as mock_get_connection:
             mock_get_connection.return_value = self.connection
             self.hook = DataprocHook()
 

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/tests/unit/yandex/hooks/test_yandex.py

@@ -25,11 +25,20 @@ from airflow.providers.yandex.hooks.yandex import YandexCloudBaseHook
 
 from tests_common.test_utils.config import conf_vars
 
+try:
+    import importlib.util
+
+    if not importlib.util.find_spec("airflow.sdk.bases.hook"):
+        raise ImportError
+
+    BASEHOOK_PATCH_PATH = "airflow.sdk.bases.hook.BaseHook"
+except ImportError:
+    BASEHOOK_PATCH_PATH = "airflow.hooks.base.BaseHook"
 yandexcloud = pytest.importorskip("yandexcloud")
 
 
 class TestYandexHook:
-    @mock.patch("airflow.hooks.base.BaseHook.get_connection")
+    @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @mock.patch("airflow.providers.yandex.utils.credentials.get_credentials")
     def test_client_created_without_exceptions(self, mock_get_credentials, mock_get_connection):
         """tests `init` method to validate client creation when all parameters are passed"""
@@ -52,7 +61,7 @@ class TestYandexHook:
         )
         assert hook.client is not None
 
-    @mock.patch("airflow.hooks.base.BaseHook.get_connection")
+    @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @mock.patch("airflow.providers.yandex.utils.credentials.get_credentials")
     def test_sdk_user_agent(self, mock_get_credentials, mock_get_connection):
         mock_get_connection.return_value = mock.Mock(yandex_conn_id="yandexcloud_default", extra_dejson="{}")
@@ -63,7 +72,7 @@ class TestYandexHook:
             hook = YandexCloudBaseHook()
             assert hook.sdk._channels._client_user_agent.startswith(sdk_prefix)
 
-    @mock.patch("airflow.hooks.base.BaseHook.get_connection")
+    @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @mock.patch("airflow.providers.yandex.utils.credentials.get_credentials")
     def test_get_endpoint_specified(self, mock_get_credentials, mock_get_connection):
         default_folder_id = "test_id"
@@ -83,7 +92,7 @@ class TestYandexHook:
 
         assert hook._get_endpoint() == {"endpoint": "my_endpoint"}
 
-    @mock.patch("airflow.hooks.base.BaseHook.get_connection")
+    @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @mock.patch("airflow.providers.yandex.utils.credentials.get_credentials")
     def test_get_endpoint_unspecified(self, mock_get_credentials, mock_get_connection):
         default_folder_id = "test_id"
@@ -103,7 +112,7 @@ class TestYandexHook:
 
         assert hook._get_endpoint() == {}
 
-    @mock.patch("airflow.hooks.base.BaseHook.get_connection")
+    @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     def test__get_field(self, mock_get_connection):
         field_name = "one"
         field_value = "value_one"
@@ -128,7 +137,7 @@ class TestYandexHook:
 
         assert res == field_value
 
-    @mock.patch("airflow.hooks.base.BaseHook.get_connection")
+    @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     def test__get_field_extras_not_found(self, get_connection_mock):
         field_name = "some_field"
         default = "some_default"

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/tests/unit/yandex/hooks/test_yq.py

@@ -27,6 +27,15 @@ from responses import matchers
 from airflow.models import Connection
 from airflow.providers.yandex.hooks.yq import YQHook
 
+try:
+    import importlib.util
+
+    if not importlib.util.find_spec("airflow.sdk.bases.hook"):
+        raise ImportError
+
+    BASEHOOK_PATCH_PATH = "airflow.sdk.bases.hook.BaseHook"
+except ImportError:
+    BASEHOOK_PATCH_PATH = "airflow.hooks.base.BaseHook"
 yandexcloud = pytest.importorskip("yandexcloud")
 
 OAUTH_TOKEN = "my_oauth_token"
@@ -36,7 +45,7 @@ SERVICE_ACCOUNT_AUTH_KEY_JSON = """{"id":"my_id", "service_account_id":"my_sa1",
 
 class TestYandexCloudYqHook:
     def _init_hook(self):
-        with mock.patch("airflow.hooks.base.BaseHook.get_connection") as mock_get_connection:
+        with mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection") as mock_get_connection:
             mock_get_connection.return_value = self.connection
             self.hook = YQHook(default_folder_id="my_folder_id")
 

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/tests/unit/yandex/links/test_yq.py

@@ -35,18 +35,15 @@ yandexcloud = pytest.importorskip("yandexcloud")
 
 
 def test_persist():
-    mock_context = mock.MagicMock()
+    mock_ti = mock.MagicMock()
+    mock_context = {"ti": mock_ti}
+    if not AIRFLOW_V_3_0_PLUS:
+        mock_context["task_instance"] = mock_ti
 
-    YQLink.persist(context=mock_context, task_instance=MockOperator(task_id="test_task_id"), web_link="g.com")
+    YQLink.persist(context=mock_context, web_link="g.com")
 
     ti = mock_context["ti"]
-    if AIRFLOW_V_3_0_PLUS:
-        ti.xcom_push.assert_called_once_with(
-            key="web_link",
-            value="g.com",
-        )
-    else:
-        ti.xcom_push.assert_called_once_with(key="web_link", value="g.com", execution_date=None)
+    ti.xcom_push.assert_called_once_with(key="web_link", value="g.com")
 
 
 def test_default_link():

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/tests/unit/yandex/operators/test_dataproc.py

@@ -66,6 +66,16 @@ SSH_PUBLIC_KEYS = [
 # https://cloud.yandex.com/docs/logging/concepts/log-group
 LOG_GROUP_ID = "my_log_group_id"
 
+try:
+    import importlib.util
+
+    if not importlib.util.find_spec("airflow.sdk.bases.hook"):
+        raise ImportError
+
+    BASEHOOK_PATCH_PATH = "airflow.sdk.bases.hook.BaseHook"
+except ImportError:
+    BASEHOOK_PATCH_PATH = "airflow.hooks.base.BaseHook"
+
 
 class TestDataprocClusterCreateOperator:
     def setup_method(self):
@@ -81,7 +91,7 @@ class TestDataprocClusterCreateOperator:
         )
 
     @patch("airflow.providers.yandex.utils.credentials.get_credentials")
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @patch("yandexcloud._wrappers.dataproc.Dataproc.create_cluster")
     def test_create_cluster(self, mock_create_cluster, *_):
         operator = DataprocCreateClusterOperator(
@@ -145,7 +155,7 @@ class TestDataprocClusterCreateOperator:
         )
 
     @patch("airflow.providers.yandex.utils.credentials.get_credentials")
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @patch("yandexcloud._wrappers.dataproc.Dataproc.delete_cluster")
     def test_delete_cluster_operator(self, mock_delete_cluster, *_):
         operator = DataprocDeleteClusterOperator(
@@ -159,7 +169,7 @@ class TestDataprocClusterCreateOperator:
         mock_delete_cluster.assert_called_once_with("my_cluster_id")
 
     @patch("airflow.providers.yandex.utils.credentials.get_credentials")
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @patch("yandexcloud._wrappers.dataproc.Dataproc.create_hive_job")
     def test_create_hive_job_operator(self, mock_create_hive_job, *_):
         operator = DataprocCreateHiveJobOperator(
@@ -188,7 +198,7 @@ class TestDataprocClusterCreateOperator:
         )
 
     @patch("airflow.providers.yandex.utils.credentials.get_credentials")
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @patch("yandexcloud._wrappers.dataproc.Dataproc.create_mapreduce_job")
     def test_create_mapreduce_job_operator(self, mock_create_mapreduce_job, *_):
         operator = DataprocCreateMapReduceJobOperator(
@@ -258,7 +268,7 @@ class TestDataprocClusterCreateOperator:
         )
 
     @patch("airflow.providers.yandex.utils.credentials.get_credentials")
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @patch("yandexcloud._wrappers.dataproc.Dataproc.create_spark_job")
     def test_create_spark_job_operator(self, mock_create_spark_job, *_):
         operator = DataprocCreateSparkJobOperator(
@@ -320,7 +330,7 @@ class TestDataprocClusterCreateOperator:
         )
 
     @patch("airflow.providers.yandex.utils.credentials.get_credentials")
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     @patch("yandexcloud._wrappers.dataproc.Dataproc.create_pyspark_job")
     def test_create_pyspark_job_operator(self, mock_create_pyspark_job, *_):
         operator = DataprocCreatePysparkJobOperator(

{apache_airflow_providers_yandex-4.1.0 → apache_airflow_providers_yandex-4.1.1rc1}/tests/unit/yandex/operators/test_yq.py

@@ -32,6 +32,16 @@ from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
 
 yandexcloud = pytest.importorskip("yandexcloud")
 
+try:
+    import importlib.util
+
+    if not importlib.util.find_spec("airflow.sdk.bases.hook"):
+        raise ImportError
+
+    BASEHOOK_PATCH_PATH = "airflow.sdk.bases.hook.BaseHook"
+except ImportError:
+    BASEHOOK_PATCH_PATH = "airflow.hooks.base.BaseHook"
+
 OAUTH_TOKEN = "my_oauth_token"
 FOLDER_ID = "my_folder_id"
 
@@ -50,11 +60,14 @@ class TestYQExecuteQueryOperator:
         )
 
     @responses.activate()
-    @patch("airflow.hooks.base.BaseHook.get_connection")
+    @patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
     def test_execute_query(self, mock_get_connection):
         mock_get_connection.return_value = Connection(extra={"oauth": OAUTH_TOKEN})
         operator = YQExecuteQueryOperator(task_id="simple_sql", sql="select 987", folder_id="my_folder_id")
-        context = {"ti": MagicMock()}
+        mock_ti = MagicMock()
+        context = {"ti": mock_ti}
+        if not AIRFLOW_V_3_0_PLUS:
+            context["task_instance"] = operator
 
         responses.post(
             "https://api.yandex-query.cloud.yandex.net/api/fq/v1/queries",
@@ -90,25 +103,14 @@ class TestYQExecuteQueryOperator:
         results = operator.execute(context)
         assert results == {"rows": [[777]], "columns": [{"name": "column0", "type": "Int32"}]}
 
-        if AIRFLOW_V_3_0_PLUS:
-            context["ti"].xcom_push.assert_has_calls(
-                [
-                    call(
-                        key="web_link",
-                        value=f"https://yq.cloud.yandex.ru/folders/{FOLDER_ID}/ide/queries/query1",
-                    ),
-                ]
-            )
-        else:
-            context["ti"].xcom_push.assert_has_calls(
-                [
-                    call(
-                        key="web_link",
-                        value=f"https://yq.cloud.yandex.ru/folders/{FOLDER_ID}/ide/queries/query1",
-                        execution_date=None,
-                    ),
-                ]
-            )
+        context["ti"].xcom_push.assert_has_calls(
+            [
+                call(
+                    key="web_link",
+                    value=f"https://yq.cloud.yandex.ru/folders/{FOLDER_ID}/ide/queries/query1",
+                ),
+            ]
+        )
 
         responses.get(
             "https://api.yandex-query.cloud.yandex.net/api/fq/v1/queries/query1/status",