Consolidate SkipMixin imports through common-compat layer (#62776)

kaxil · web-flow · commit 1199dc5305ea · 2026-03-03T11:38:13.000Z
Replace version-conditional SkipMixin imports in branch.py and
test_skipmixin.py with the common.compat.sdk layer. Add the standard
provider's skipmixin as a middle fallback path in the compat import
chain for consistency with common/compat/standard/utils.py.

Also route SkipMixin and XComArg in common/sql through the compat
layer instead of importing directly from airflow.models / airflow.
diff --git a/providers/common/compat/src/airflow/providers/common/compat/sdk.py b/providers/common/compat/src/airflow/providers/common/compat/sdk.py
@@ -155,7 +155,11 @@
     # ============================================================================
     "BaseBranchOperator": ("airflow.sdk.bases.branch", "airflow.providers.standard.operators.branch"),
     "BranchMixIn": ("airflow.sdk.bases.branch", "airflow.providers.standard.operators.branch"),
-    "SkipMixin": ("airflow.sdk.bases.skipmixin", "airflow.models.skipmixin"),
+    "SkipMixin": (
+        "airflow.sdk.bases.skipmixin",
+        "airflow.models.skipmixin",
+        "airflow.providers.standard.utils.skipmixin",
+    ),
     # ============================================================================
     # Sensors
     # ============================================================================
diff --git a/providers/common/compat/src/airflow/providers/common/compat/standard/utils.py b/providers/common/compat/src/airflow/providers/common/compat/standard/utils.py
@@ -22,8 +22,8 @@
 _IMPORT_MAP: dict[str, str | tuple[str, ...]] = {
     "SkipMixin": (
         "airflow.sdk.bases.skipmixin",
-        "airflow.providers.standard.utils.skipmixin",
         "airflow.models.skipmixin",
+        "airflow.providers.standard.utils.skipmixin",
     ),
     "XCOM_SKIPMIXIN_KEY": (
         "airflow.sdk.bases.skipmixin",
diff --git a/providers/common/sql/src/airflow/providers/common/sql/operators/sql.py b/providers/common/sql/src/airflow/providers/common/sql/operators/sql.py
@@ -23,14 +23,14 @@
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, ClassVar, NoReturn, SupportsAbs
 
-from airflow import XComArg
-from airflow.models import SkipMixin
 from airflow.providers.common.compat.sdk import (
     AirflowException,
     AirflowFailException,
     AirflowSkipException,
     BaseHook,
     BaseOperator,
+    SkipMixin,
+    XComArg,
 )
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler, return_single_query_results
 from airflow.providers.common.sql.hooks.sql import DbApiHook
diff --git a/providers/standard/src/airflow/providers/standard/operators/branch.py b/providers/standard/src/airflow/providers/standard/operators/branch.py
@@ -22,12 +22,8 @@
 from collections.abc import Iterable
 from typing import TYPE_CHECKING
 
-from airflow.providers.standard.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperator
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.providers.standard.utils.skipmixin import SkipMixin
-else:
-    from airflow.models.skipmixin import SkipMixin  # type: ignore[no-redef]
+from airflow.providers.common.compat.sdk import SkipMixin
+from airflow.providers.standard.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.providers.common.compat.sdk import Context
diff --git a/providers/standard/tests/unit/standard/utils/test_skipmixin.py b/providers/standard/tests/unit/standard/utils/test_skipmixin.py
@@ -24,7 +24,7 @@
 from sqlalchemy import select
 
 from airflow.models.taskinstance import TaskInstance as TI
-from airflow.providers.common.compat.sdk import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException, SkipMixin
 from airflow.providers.standard.operators.empty import EmptyOperator
 from airflow.utils import timezone
 from airflow.utils.state import State
@@ -39,12 +39,10 @@
 if AIRFLOW_V_3_0_PLUS:
     from airflow.models.dag_version import DagVersion
     from airflow.providers.common.compat.sdk import DownstreamTasksSkipped
-    from airflow.providers.standard.utils.skipmixin import SkipMixin
     from airflow.sdk import task, task_group
     from airflow.sdk.execution_time.task_runner import RuntimeTaskInstance
 else:
     from airflow.decorators import task, task_group  # type: ignore[attr-defined,no-redef]
-    from airflow.models.skipmixin import SkipMixin  # type: ignore[no-redef]
 
 DEFAULT_DATE = timezone.datetime(2016, 1, 1)
 DEFAULT_DAG_RUN_ID = "test1"
