apache · kaxil · Oct 22, 2025 · Oct 22, 2025
@@ -265,11 +265,12 @@ def test_get_min_airflow_version(provider_id: str, min_version: str):
 
 def test_convert_cross_package_dependencies_to_table():
     EXPECTED = """
-| Dependent package                                                                   | Extra         |
-|:------------------------------------------------------------------------------------|:--------------|
-| [apache-airflow-providers-common-sql](https://airflow.apache.org/docs/common-sql)   | `common.sql`  |
-| [apache-airflow-providers-google](https://airflow.apache.org/docs/google)           | `google`      |
-| [apache-airflow-providers-openlineage](https://airflow.apache.org/docs/openlineage) | `openlineage` |
+| Dependent package                                                                       | Extra           |
+|:----------------------------------------------------------------------------------------|:----------------|
+| [apache-airflow-providers-common-compat](https://airflow.apache.org/docs/common-compat) | `common.compat` |
+| [apache-airflow-providers-common-sql](https://airflow.apache.org/docs/common-sql)       | `common.sql`    |
+| [apache-airflow-providers-google](https://airflow.apache.org/docs/google)               | `google`        |
+| [apache-airflow-providers-openlineage](https://airflow.apache.org/docs/openlineage)     | `openlineage`   |
 """
     assert (
         convert_cross_package_dependencies_to_table(get_cross_provider_dependent_packages("trino")).strip()

@@ -27,7 +27,7 @@ def test_get_downstream_only():
     related_providers = get_related_providers(
         "trino", upstream_dependencies=False, downstream_dependencies=True
     )
-    assert {"openlineage", "google", "common.sql"} == related_providers
+    assert {"openlineage", "google", "common.sql", "common.compat"} == related_providers
 
 
 def test_get_upstream_only():
@@ -41,7 +41,7 @@ def test_both():
     related_providers = get_related_providers(
         "trino", upstream_dependencies=True, downstream_dependencies=True
     )
-    assert {"openlineage", "google", "mysql", "common.sql"} == related_providers
+    assert {"openlineage", "google", "mysql", "common.sql", "common.compat"} == related_providers
 
 
 def test_none():

diff --git a/providers/tableau/pyproject.toml b/providers/tableau/pyproject.toml
@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",    # TODO: bump to next version
     "tableauserverclient>=0.27",
 ]
 
@@ -66,6 +67,7 @@ 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)
 ]
 

diff --git a/providers/tableau/src/airflow/providers/tableau/hooks/tableau.py b/providers/tableau/src/airflow/providers/tableau/hooks/tableau.py
@@ -24,7 +24,7 @@
 from tableauserverclient import JWTAuth, Pager, Server, TableauAuth
 
 from airflow.exceptions import AirflowException
-from airflow.providers.tableau.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.utils.helpers import exactly_one
 
 if TYPE_CHECKING:

diff --git a/providers/tableau/src/airflow/providers/tableau/operators/tableau.py b/providers/tableau/src/airflow/providers/tableau/operators/tableau.py
@@ -20,19 +20,15 @@
 from typing import TYPE_CHECKING
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.tableau.hooks.tableau import (
     TableauHook,
     TableauJobFailedException,
     TableauJobFinishCode,
 )
-from airflow.providers.tableau.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.common.compat.sdk import Context
 
 RESOURCES_METHODS = {
     "datasources": ["delete", "refresh"],

diff --git a/providers/tableau/src/airflow/providers/tableau/sensors/tableau.py b/providers/tableau/src/airflow/providers/tableau/sensors/tableau.py
@@ -19,19 +19,15 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 from airflow.providers.tableau.hooks.tableau import (
     TableauHook,
     TableauJobFailedException,
     TableauJobFinishCode,
 )
-from airflow.providers.tableau.version_compat import BaseSensorOperator
 
 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.common.compat.sdk import Context
 
 
 class TableauJobStatusSensor(BaseSensorOperator):

diff --git a/providers/tableau/src/airflow/providers/tableau/version_compat.py b/providers/tableau/src/airflow/providers/tableau/version_compat.py
@@ -35,15 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator, BaseSensorOperator
-else:
-    from airflow.models import BaseOperator
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator", "BaseSensorOperator"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]
diff --git a/providers/telegram/pyproject.toml b/providers/telegram/pyproject.toml
@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",    # TODO: bump to next version
     "python-telegram-bot>=20.2",
 ]
 
@@ -66,6 +67,7 @@ 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)
 ]
 

diff --git a/providers/telegram/src/airflow/providers/telegram/hooks/telegram.py b/providers/telegram/src/airflow/providers/telegram/hooks/telegram.py
@@ -26,7 +26,7 @@
 import tenacity
 
 from airflow.exceptions import AirflowException
-from airflow.providers.telegram.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 
 class TelegramHook(BaseHook):

diff --git a/providers/telegram/src/airflow/providers/telegram/operators/telegram.py b/providers/telegram/src/airflow/providers/telegram/operators/telegram.py
@@ -23,15 +23,11 @@
 from typing import TYPE_CHECKING
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.telegram.hooks.telegram import TelegramHook
-from airflow.providers.telegram.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.common.compat.sdk import Context
 
 
 class TelegramOperator(BaseOperator):

diff --git a/providers/telegram/src/airflow/providers/telegram/version_compat.py b/providers/telegram/src/airflow/providers/telegram/version_compat.py
@@ -35,14 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator
-else:
-    from airflow.models import BaseOperator
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]
diff --git a/providers/teradata/pyproject.toml b/providers/teradata/pyproject.toml
@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",    # TODO: bump to next version
     "apache-airflow-providers-common-sql>=1.20.0",
     "teradatasqlalchemy>=17.20.0.0",
     "teradatasql>=17.20.0.28",
@@ -82,6 +83,7 @@ dev = [
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
     "apache-airflow-providers-amazon",
+    "apache-airflow-providers-common-compat",
     "apache-airflow-providers-common-sql",
     "apache-airflow-providers-microsoft-azure",
     "apache-airflow-providers-ssh",

diff --git a/providers/teradata/src/airflow/providers/teradata/hooks/ttu.py b/providers/teradata/src/airflow/providers/teradata/hooks/ttu.py
@@ -22,7 +22,7 @@
 from typing import Any
 
 from airflow.exceptions import AirflowException
-from airflow.providers.teradata.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 
 class TtuHook(BaseHook, ABC):

diff --git a/providers/teradata/src/airflow/providers/teradata/operators/bteq.py b/providers/teradata/src/airflow/providers/teradata/operators/bteq.py
@@ -32,14 +32,11 @@
 if TYPE_CHECKING:
     from paramiko import SSHClient
 
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.ssh.hooks.ssh import SSHHook
 from airflow.providers.teradata.hooks.bteq import BteqHook
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 
 def contains_template(parameter_value):

diff --git a/providers/teradata/src/airflow/providers/teradata/operators/teradata.py b/providers/teradata/src/airflow/providers/teradata/operators/teradata.py
@@ -20,16 +20,12 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, ClassVar
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.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.common.compat.sdk import Context
 
 
 class TeradataOperator(SQLExecuteQueryOperator):

diff --git a/providers/teradata/src/airflow/providers/teradata/operators/teradata_compute_cluster.py b/providers/teradata/src/airflow/providers/teradata/operators/teradata_compute_cluster.py
@@ -23,16 +23,12 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
 from airflow.providers.teradata.utils.constants import Constants
-from airflow.providers.teradata.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.common.compat.sdk import Context
 
 from collections.abc import Sequence
 from datetime import timedelta
@@ -41,11 +37,7 @@
 from airflow.providers.teradata.triggers.teradata_compute_cluster import TeradataComputeClusterSyncTrigger
 
 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.common.compat.sdk import Context
 
 from airflow.exceptions import AirflowException
 

diff --git a/providers/teradata/src/airflow/providers/teradata/transfers/azure_blob_to_teradata.py b/providers/teradata/src/airflow/providers/teradata/transfers/azure_blob_to_teradata.py
@@ -28,11 +28,11 @@
 
     raise AirflowOptionalProviderFeatureException(e)
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class AzureBlobStorageToTeradataOperator(BaseOperator):

diff --git a/providers/teradata/src/airflow/providers/teradata/transfers/s3_to_teradata.py b/providers/teradata/src/airflow/providers/teradata/transfers/s3_to_teradata.py
@@ -27,15 +27,11 @@
     from airflow.exceptions import AirflowOptionalProviderFeatureException
 
     raise AirflowOptionalProviderFeatureException(e)
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.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.common.compat.sdk import Context
 
 
 class S3ToTeradataOperator(BaseOperator):

diff --git a/providers/teradata/src/airflow/providers/teradata/transfers/teradata_to_teradata.py b/providers/teradata/src/airflow/providers/teradata/transfers/teradata_to_teradata.py
@@ -21,15 +21,11 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.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.common.compat.sdk import Context
 
 
 class TeradataToTeradataOperator(BaseOperator):

diff --git a/providers/teradata/src/airflow/providers/teradata/version_compat.py b/providers/teradata/src/airflow/providers/teradata/version_compat.py
@@ -35,14 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator
-else:
-    from airflow.models import BaseOperator
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]
diff --git a/providers/teradata/tests/unit/teradata/operators/test_bteq.py b/providers/teradata/tests/unit/teradata/operators/test_bteq.py
@@ -258,7 +258,7 @@ def test_remote_execution_with_sql(
         mock_execute_bteq_script.assert_called_once()
         assert result == 0
 
-    @mock.patch("airflow.providers.teradata.version_compat.BaseOperator.render_template")
+    @mock.patch("airflow.providers.common.compat.sdk.BaseOperator.render_template")
     def test_render_template_in_sql(self, mock_render):
         op = BteqOperator(task_id="render_test", sql="SELECT * FROM {{ params.table }};")
         mock_render.return_value = "SELECT * FROM my_table;"

diff --git a/providers/trino/pyproject.toml b/providers/trino/pyproject.toml
@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",    # TODO: bump to next version
     "apache-airflow-providers-common-sql>=1.20.0",
     'pandas>=2.1.2; python_version <"3.13"',
     'pandas>=2.2.3; python_version >="3.13"',
@@ -79,6 +80,7 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     "apache-airflow-providers-common-sql",
     "apache-airflow-providers-google",
     "apache-airflow-providers-openlineage",

diff --git a/providers/trino/src/airflow/providers/trino/transfers/gcs_to_trino.py b/providers/trino/src/airflow/providers/trino/transfers/gcs_to_trino.py
@@ -25,16 +25,12 @@
 from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.google.cloud.hooks.gcs import GCSHook
 from airflow.providers.trino.hooks.trino import TrinoHook
-from airflow.providers.trino.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.common.compat.sdk import Context
 
 
 class GCSToTrinoOperator(BaseOperator):

diff --git a/providers/trino/src/airflow/providers/trino/version_compat.py b/providers/trino/src/airflow/providers/trino/version_compat.py
@@ -34,12 +34,6 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator
-else:
-    from airflow.models import BaseOperator
-
 __all__ = [
     "AIRFLOW_V_3_0_PLUS",
-    "BaseOperator",
 ]