From a731f54ce1196dcf1b6c361e9ac99eb6da0d1ed2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 22 Oct 2025 23:50:21 +0800 Subject: [PATCH 1/4] Migrate remaining providers to common.compat compatibility layer in dingding --- providers/dingding/pyproject.toml | 2 ++ .../src/airflow/providers/dingding/operators/dingding.py | 4 ++-- .../src/airflow/providers/dingding/version_compat.py | 9 --------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/providers/dingding/pyproject.toml b/providers/dingding/pyproject.toml index 69cf8d26c4562..5f1648e83e2e9 100644 --- a/providers/dingding/pyproject.toml +++ b/providers/dingding/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-http", ] @@ -67,6 +68,7 @@ dev = [ "apache-airflow-task-sdk", "apache-airflow-devel-common", "apache-airflow-providers-http", + "apache-airflow-providers-common-compat", # Additional devel dependencies (do not remove this line and add extra development dependencies) ] diff --git a/providers/dingding/src/airflow/providers/dingding/operators/dingding.py b/providers/dingding/src/airflow/providers/dingding/operators/dingding.py index 642b21093a514..d7d492e273c05 100644 --- a/providers/dingding/src/airflow/providers/dingding/operators/dingding.py +++ b/providers/dingding/src/airflow/providers/dingding/operators/dingding.py @@ -21,10 +21,10 @@ from typing import TYPE_CHECKING from airflow.providers.dingding.hooks.dingding import DingdingHook -from airflow.providers.dingding.version_compat import BaseOperator +from airflow.providers.common.compat.sdk import BaseOperator if TYPE_CHECKING: - from airflow.providers.dingding.version_compat import Context + from airflow.providers.common.compat.sdk import Context class DingdingOperator(BaseOperator): diff --git a/providers/dingding/src/airflow/providers/dingding/version_compat.py b/providers/dingding/src/airflow/providers/dingding/version_compat.py index c267288006129..ff0f446dc5efc 100644 --- a/providers/dingding/src/airflow/providers/dingding/version_compat.py +++ b/providers/dingding/src/airflow/providers/dingding/version_compat.py @@ -29,15 +29,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 - from airflow.sdk.definitions.context import Context -else: - from airflow.models import BaseOperator - from airflow.utils.context import Context - __all__ = [ "AIRFLOW_V_3_0_PLUS", - "BaseOperator", - "Context", ] From 36be3dd3238a82128cc84eb1bce3be444b7b4175 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 23 Oct 2025 15:21:57 +0800 Subject: [PATCH 2/4] fix dingding static check --- .../src/airflow/providers/dingding/operators/dingding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/dingding/src/airflow/providers/dingding/operators/dingding.py b/providers/dingding/src/airflow/providers/dingding/operators/dingding.py index d7d492e273c05..57187018e2a5e 100644 --- a/providers/dingding/src/airflow/providers/dingding/operators/dingding.py +++ b/providers/dingding/src/airflow/providers/dingding/operators/dingding.py @@ -20,8 +20,8 @@ from collections.abc import Sequence from typing import TYPE_CHECKING -from airflow.providers.dingding.hooks.dingding import DingdingHook from airflow.providers.common.compat.sdk import BaseOperator +from airflow.providers.dingding.hooks.dingding import DingdingHook if TYPE_CHECKING: from airflow.providers.common.compat.sdk import Context From c87c4ce8d8693efb763f37e7a169d954ec0c9eb2 Mon Sep 17 00:00:00 2001 From: ChenChen Lai <72776271+0lai0@users.noreply.github.com> Date: Sun, 26 Oct 2025 15:15:37 +0800 Subject: [PATCH 3/4] Update providers/dingding/pyproject.toml Co-authored-by: Kaxil Naik --- providers/dingding/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/dingding/pyproject.toml b/providers/dingding/pyproject.toml index 5f1648e83e2e9..1ccba2232424c 100644 --- a/providers/dingding/pyproject.toml +++ b/providers/dingding/pyproject.toml @@ -58,7 +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-compat>=1.8.0", "apache-airflow-providers-http", ] From 266f05b37a4d87986268bb84d19fc417aa723112 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Sun, 26 Oct 2025 23:23:11 +0000 Subject: [PATCH 4/4] Fix tests --- providers/apache/druid/pyproject.toml | 3 +++ providers/dingding/pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/providers/apache/druid/pyproject.toml b/providers/apache/druid/pyproject.toml index 9eb64fff9ef46..996b5bdcc2c48 100644 --- a/providers/apache/druid/pyproject.toml +++ b/providers/apache/druid/pyproject.toml @@ -68,6 +68,9 @@ dependencies = [ "apache.hive" = [ "apache-airflow-providers-apache-hive" ] +"common.compat" = [ + "apache-airflow-providers-common-compat" +] [dependency-groups] dev = [ diff --git a/providers/dingding/pyproject.toml b/providers/dingding/pyproject.toml index 1ccba2232424c..1e0045b4311b6 100644 --- a/providers/dingding/pyproject.toml +++ b/providers/dingding/pyproject.toml @@ -67,8 +67,8 @@ dev = [ "apache-airflow", "apache-airflow-task-sdk", "apache-airflow-devel-common", - "apache-airflow-providers-http", "apache-airflow-providers-common-compat", + "apache-airflow-providers-http", # Additional devel dependencies (do not remove this line and add extra development dependencies) ]