Skip to content

Migrate smtp provider to common.compat #57105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hussein-awala merged 4 commits into from
Oct 24, 2025
Merged

Migrate smtp provider to common.compat #57105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f518fc
migrate smtp provider to common.compat
bhavaniravi Oct 22, 2025
a3a3a39
Merge branch 'main' into bhavaniravi/migrate-smtp-to-common-compat
bhavaniravi Oct 22, 2025
c873a4d
migrate smtp provider to common.compat
bhavaniravi Oct 22, 2025
67b3055
import error in tests
bhavaniravi Oct 23, 2025
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
7 changes: 2 additions & 5 deletions providers/smtp/src/airflow/providers/smtp/hooks/smtp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,10 @@
import aiosmtplib

from airflow.exceptions import AirflowException, AirflowNotFoundException
from airflow.providers.smtp.version_compat import BaseHook
from airflow.providers.common.compat.sdk import BaseHook

if TYPE_CHECKING:
try:
from airflow.sdk import Connection
except (ImportError, ModuleNotFoundError):
from airflow.models.connection import Connection # type: ignore[assignment]
from airflow.providers.common.compat.sdk import Connection


def build_xoauth2_string(username: str, token: str) -> str:
Expand Down
2 changes: 1 addition & 1 deletion providers/smtp/src/airflow/providers/smtp/notifications/smtp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from airflow.providers.smtp.version_compat import AIRFLOW_V_3_1_PLUS

if TYPE_CHECKING:
from airflow.sdk import Context
from airflow.providers.common.compat.sdk import Context


class SmtpNotifier(BaseNotifier):
Expand Down
4 changes: 2 additions & 2 deletions providers/smtp/src/airflow/providers/smtp/operators/smtp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
from typing import TYPE_CHECKING, Any

from airflow.exceptions import AirflowException
from airflow.providers.common.compat.sdk import BaseOperator
from airflow.providers.smtp.hooks.smtp import SmtpHook
from airflow.providers.smtp.version_compat import BaseOperator

if TYPE_CHECKING:
from airflow.providers.smtp.version_compat import Context
from airflow.providers.common.compat.sdk import Context


class EmailOperator(BaseOperator):
Expand Down
15 changes: 0 additions & 15 deletions providers/smtp/src/airflow/providers/smtp/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,7 @@ 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_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

if AIRFLOW_V_3_1_PLUS:
from airflow.sdk import BaseHook
else:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]

__all__ = [
"AIRFLOW_V_3_0_PLUS",
"AIRFLOW_V_3_1_PLUS",
"BaseHook",
"BaseOperator",
"Context",
]