You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by hu...@apache.org on 2025/07/11 13:40:21 UTC

(airflow) branch main updated: Import XCOM_RETURN_KEY in providers from task SDK (#53180)

This is an automated email from the ASF dual-hosted git repository.

husseinawala pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new a5c5c3fc572 Import XCOM_RETURN_KEY in providers from task SDK (#53180)
a5c5c3fc572 is described below

commit a5c5c3fc572db7255669924087080fe54f27ed17
Author: Amogh Desai <am...@gmail.com>
AuthorDate: Fri Jul 11 19:10:13 2025 +0530

    Import XCOM_RETURN_KEY in providers from task SDK (#53180)
---
 devel-common/src/tests_common/test_utils/version_compat.py            | 4 +++-
 .../azure/src/airflow/providers/microsoft/azure/version_compat.py     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/devel-common/src/tests_common/test_utils/version_compat.py b/devel-common/src/tests_common/test_utils/version_compat.py
index 4a7c8805364..55c045cd949 100644
--- a/devel-common/src/tests_common/test_utils/version_compat.py
+++ b/devel-common/src/tests_common/test_utils/version_compat.py
@@ -37,7 +37,9 @@ AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS = get_base_airflow_version_tuple() >= (3, 1, 0)
 
 if AIRFLOW_V_3_1_PLUS:
-    from airflow.models.xcom import XCOM_RETURN_KEY
+    from airflow.sdk.bases.xcom import BaseXCom
+
+    XCOM_RETURN_KEY = BaseXCom.XCOM_RETURN_KEY
 else:
     from airflow.utils.xcom import XCOM_RETURN_KEY  # type: ignore[no-redef]
 
diff --git a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/version_compat.py b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/version_compat.py
index 92c90e6a938..f8637b3659f 100644
--- a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/version_compat.py
+++ b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/version_compat.py
@@ -46,7 +46,9 @@ else:
     from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
 
 if AIRFLOW_V_3_1_PLUS:
-    from airflow.models.xcom import XCOM_RETURN_KEY
+    from airflow.sdk.bases.xcom import BaseXCom
+
+    XCOM_RETURN_KEY = BaseXCom.XCOM_RETURN_KEY
     from airflow.sdk import BaseHook
 else:
     from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]