Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion devel-common/src/tests_common/test_utils/version_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
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]
Expand Down