Skip to content

Move BaseHook imports to version_compat for standard provider #52766

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
amoghrajesh merged 2 commits into from
Jul 3, 2025
Merged

Move BaseHook imports to version_compat for standard provider #52766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba50d4f
Move BaseHook imports to version_compat for standard provider
amoghrajesh Jul 3, 2025
fedb3aa
v3.1
amoghrajesh Jul 3, 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
5 changes: 1 addition & 4 deletions providers/standard/src/airflow/providers/standard/hooks/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
from pathlib import Path
from typing import Any

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.standard.version_compat import BaseHook


class FSHook(BaseHook):
Expand Down
5 changes: 1 addition & 4 deletions providers/standard/src/airflow/providers/standard/hooks/package_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
from typing import Any
from urllib.parse import quote, urlparse

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.standard.version_compat import BaseHook


class PackageIndexHook(BaseHook):
Expand Down
5 changes: 1 addition & 4 deletions providers/standard/src/airflow/providers/standard/hooks/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
from subprocess import PIPE, STDOUT, Popen
from tempfile import TemporaryDirectory, gettempdir

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.standard.version_compat import BaseHook

SubprocessResult = namedtuple("SubprocessResult", ["exit_code", "output"])

Expand Down
4 changes: 3 additions & 1 deletion providers/standard/src/airflow/providers/standard/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
# DecoratedOperator -- where `DecoratedOperator._handle_output` needed `xcom_push` to exist on `BaseOperator`
# even though it wasn't used.
if AIRFLOW_V_3_1_PLUS:
from airflow.sdk import BaseOperator
from airflow.sdk import BaseHook, BaseOperator
else:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.models.baseoperator import BaseOperator # type: ignore[no-redef]

if AIRFLOW_V_3_0_PLUS:
Expand All @@ -55,6 +56,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
"AIRFLOW_V_3_1_PLUS",
"BaseOperator",
"BaseOperatorLink",
"BaseHook",
"BaseSensorOperator",
"PokeReturnValue",
]