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: 2 additions & 2 deletions providers/slack/src/airflow/providers/slack/hooks/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@
from typing_extensions import NotRequired

from airflow.exceptions import AirflowException, AirflowNotFoundException
from airflow.providers.common.compat.sdk import BaseHook
from airflow.providers.slack.utils import ConnectionExtraConfig, get_async_connection
from airflow.providers.slack.version_compat import BaseHook
from airflow.utils.helpers import exactly_one

if TYPE_CHECKING:
from slack_sdk.http_retry import RetryHandler
from slack_sdk.web.async_client import AsyncSlackResponse
from slack_sdk.web.slack_response import SlackResponse

from airflow.providers.slack.version_compat import Connection
from airflow.providers.common.compat.sdk import Connection


class FileUploadTypeDef(TypedDict):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
from slack_sdk.webhook.async_client import AsyncWebhookClient

from airflow.exceptions import AirflowException, AirflowNotFoundException
from airflow.providers.common.compat.sdk import BaseHook
from airflow.providers.slack.utils import ConnectionExtraConfig, get_async_connection
from airflow.providers.slack.version_compat import BaseHook

if TYPE_CHECKING:
from slack_sdk.http_retry import RetryHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@
from typing import TYPE_CHECKING, Any, Literal

from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.common.compat.sdk import BaseOperator
from airflow.providers.slack.hooks.slack import SlackHook
from airflow.providers.slack.version_compat import BaseOperator

if TYPE_CHECKING:
from slack_sdk.http_retry import RetryHandler

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 SlackAPIOperator(BaseOperator):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@
from functools import cached_property
from typing import TYPE_CHECKING

from airflow.providers.common.compat.sdk import BaseOperator
from airflow.providers.slack.hooks.slack_webhook import SlackWebhookHook
from airflow.providers.slack.version_compat import BaseOperator

if TYPE_CHECKING:
from slack_sdk.http_retry import RetryHandler

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 SlackWebhookOperator(BaseOperator):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from typing import TYPE_CHECKING, Any

from airflow.exceptions import AirflowException
from airflow.providers.slack.version_compat import BaseHook, BaseOperator
from airflow.providers.common.compat.sdk import BaseHook, BaseOperator

if TYPE_CHECKING:
import pandas as pd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@
from airflow.providers.slack.utils import parse_filename

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 SqlToSlackApiFileOperator(BaseSqlToSlackOperator):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@
from airflow.providers.slack.transfers.base_sql_to_slack import BaseSqlToSlackOperator

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 SqlToSlackWebhookOperator(BaseSqlToSlackOperator):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from asgiref.sync import sync_to_async

from airflow.providers.slack.version_compat import BaseHook, Connection
from airflow.providers.common.compat.sdk import BaseHook, Connection
from airflow.utils.types import NOTSET


Expand Down
13 changes: 0 additions & 13 deletions providers/slack/src/airflow/providers/slack/version_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +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, Connection
else:
from airflow.models import BaseOperator, Connection # type: ignore[assignment]

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",
"Connection",
]