From 7233493b90a32cd4c5de207b968078b2d6c43231 Mon Sep 17 00:00:00 2001 From: Tushar4432 <139869581+Tushar4432@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:48:58 +0530 Subject: [PATCH 1/2] issue 44559 removed depricated code from alibaba provider --- .../src/airflow/providers/alibaba/CHANGELOG.rst | 14 ++++++++++++++ .../alibaba/cloud/operators/analyticdb_spark.py | 7 ------- .../alibaba/cloud/sensors/analyticdb_spark.py | 7 ------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/providers/src/airflow/providers/alibaba/CHANGELOG.rst b/providers/src/airflow/providers/alibaba/CHANGELOG.rst index 6926f10a86362..3dd8a237f58c2 100644 --- a/providers/src/airflow/providers/alibaba/CHANGELOG.rst +++ b/providers/src/airflow/providers/alibaba/CHANGELOG.rst @@ -26,6 +26,20 @@ Changelog --------- + + +.. warning:: + All deprecated classes, parameters and features have been removed from the alibaba provider package. + The following breaking changes were introduced: + + * Operators + * Remove ``get_hook`` method from ``AnalyticDBSparkBaseOperator``. Use ``self.hook`` instead. + + * sensors + * Remove ``get_hook`` method from ``AnalyticDBSparkSensor``. Use ``self.hook`` instead. + + + 2.9.1 ..... diff --git a/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py b/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py index 324b715ddff33..c76f54a37d320 100644 --- a/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py +++ b/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py @@ -22,8 +22,6 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from deprecated.classic import deprecated - from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning from airflow.models import BaseOperator from airflow.providers.alibaba.cloud.hooks.analyticdb_spark import AnalyticDBSparkHook, AppState @@ -56,11 +54,6 @@ def hook(self) -> AnalyticDBSparkHook: """Get valid hook.""" return AnalyticDBSparkHook(adb_spark_conn_id=self._adb_spark_conn_id, region=self._region) - @deprecated(reason="use `hook` property instead.", category=AirflowProviderDeprecationWarning) - def get_hook(self) -> AnalyticDBSparkHook: - """Get valid hook.""" - return self.hook - def execute(self, context: Context) -> Any: ... def monitor_application(self): diff --git a/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py b/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py index afbbeef4d9275..5a5414ac129d5 100644 --- a/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py +++ b/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py @@ -21,8 +21,6 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from deprecated.classic import deprecated - from airflow.exceptions import AirflowProviderDeprecationWarning from airflow.providers.alibaba.cloud.hooks.analyticdb_spark import AnalyticDBSparkHook, AppState from airflow.sensors.base import BaseSensorOperator @@ -60,11 +58,6 @@ def hook(self) -> AnalyticDBSparkHook: """Get valid hook.""" return AnalyticDBSparkHook(adb_spark_conn_id=self._adb_spark_conn_id, region=self._region) - @deprecated(reason="use `hook` property instead.", category=AirflowProviderDeprecationWarning) - def get_hook(self) -> AnalyticDBSparkHook: - """Get valid hook.""" - return self.hook - def poke(self, context: Context) -> bool: app_id = self.app_id From 3f69ddeb69f7492ac87390cd3b1891de9b63fe47 Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:20:26 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Shahar Epstein <60007259+shahar1@users.noreply.github.com> --- .../providers/alibaba/cloud/operators/analyticdb_spark.py | 2 +- .../airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py b/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py index c76f54a37d320..3cf414230f519 100644 --- a/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py +++ b/providers/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py @@ -22,7 +22,7 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning +from airflow.exceptions import AirflowException from airflow.models import BaseOperator from airflow.providers.alibaba.cloud.hooks.analyticdb_spark import AnalyticDBSparkHook, AppState diff --git a/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py b/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py index 5a5414ac129d5..705c1fddab7f7 100644 --- a/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py +++ b/providers/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py @@ -21,7 +21,6 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from airflow.exceptions import AirflowProviderDeprecationWarning from airflow.providers.alibaba.cloud.hooks.analyticdb_spark import AnalyticDBSparkHook, AppState from airflow.sensors.base import BaseSensorOperator