WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 3fcda65

Browse files
committed
Extract shared "module_loading" distribution
This PR extracts shared "module_loading" distrubution that is going to be used in both - airflow-core and task-sdk.
1 parent 38cf214 commit 3fcda65

File tree

74 files changed

+275
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+275
-169
lines changed

airflow-core/docs/authoring-and-scheduling/serializers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Registered
8787
8888
from typing import TYPE_CHECKING
8989
90-
from airflow.utils.module_loading import qualname
90+
from airflow.sdk.module_loading import qualname
9191
9292
if TYPE_CHECKING:
9393
import decimal

airflow-core/pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,12 @@ exclude = [
223223

224224
[tool.hatch.build.targets.sdist.force-include]
225225
"../shared/configuration/src/airflow_shared/configuration" = "src/airflow/_shared/configuration"
226+
"../shared/module_loading/src/airflow_shared/module_loading" = "src/airflow/_shared/module_loading"
226227
"../shared/logging/src/airflow_shared/logging" = "src/airflow/_shared/logging"
228+
"../shared/observability/src/airflow_shared/observability" = "src/airflow/_shared/observability"
229+
"../shared/secrets_backend/src/airflow_shared/secrets_backend" = "src/airflow/_shared/secrets_backend"
227230
"../shared/secrets_masker/src/airflow_shared/secrets_masker" = "src/airflow/_shared/secrets_masker"
228231
"../shared/timezones/src/airflow_shared/timezones" = "src/airflow/_shared/timezones"
229-
"../shared/secrets_backend/src/airflow_shared/secrets_backend" = "src/airflow/_shared/secrets_backend"
230-
"../shared/observability/src/airflow_shared/observability" = "src/airflow/_shared/observability"
231232

232233
[tool.hatch.build.targets.custom]
233234
path = "./hatch_build.py"
@@ -297,6 +298,7 @@ apache-airflow-devel-common = { workspace = true }
297298
shared_distributions = [
298299
"apache-airflow-shared-configuration",
299300
"apache-airflow-shared-logging",
301+
"apache-airflow-shared-module-loading",
300302
"apache-airflow-shared-secrets-backend",
301303
"apache-airflow-shared-secrets-masker",
302304
"apache-airflow-shared-timezones",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../shared/module_loading/src/airflow_shared/module_loading

airflow-core/src/airflow/cli/cli_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
import lazy_object_proxy
3131

32+
from airflow._shared.module_loading import import_string
3233
from airflow._shared.timezones.timezone import parse as parsedate
3334
from airflow.cli.commands.legacy_commands import check_legacy_command
3435
from airflow.configuration import conf
3536
from airflow.jobs.job import JobState
3637
from airflow.utils.cli import ColorMode
37-
from airflow.utils.module_loading import import_string
3838
from airflow.utils.state import DagRunState
3939

4040
BUILD_DOCS = "BUILDING_AIRFLOW_DOCS" in os.environ

airflow-core/src/airflow/cli/commands/db_manager_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
from __future__ import annotations
1818

1919
from airflow import settings
20+
from airflow._shared.module_loading import import_string
2021
from airflow.cli.commands.db_command import run_db_downgrade_command, run_db_migrate_command
2122
from airflow.configuration import conf
2223
from airflow.utils import cli as cli_utils
23-
from airflow.utils.module_loading import import_string
2424
from airflow.utils.providers_configuration_loader import providers_configuration_loaded
2525

2626

airflow-core/src/airflow/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
AirflowConfigParser as _SharedAirflowConfigParser,
4444
ValueNotFound,
4545
)
46+
from airflow._shared.module_loading import import_string
4647
from airflow.exceptions import AirflowConfigException
4748
from airflow.secrets import DEFAULT_SECRETS_SEARCH_PATH
4849
from airflow.task.weight_rule import WeightRule
4950
from airflow.utils import yaml
50-
from airflow.utils.module_loading import import_string
5151

5252
if TYPE_CHECKING:
5353
from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager

airflow-core/src/airflow/dag_processing/bundles/manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
from pydantic import BaseModel, ValidationError
2424
from sqlalchemy import delete, select
2525

26+
from airflow._shared.module_loading import import_string
2627
from airflow.configuration import conf
2728
from airflow.dag_processing.bundles.base import BaseDagBundle # noqa: TC001
2829
from airflow.exceptions import AirflowConfigException
2930
from airflow.models.dagbundle import DagBundleModel
3031
from airflow.models.team import Team
3132
from airflow.utils.log.logging_mixin import LoggingMixin
32-
from airflow.utils.module_loading import import_string
3333
from airflow.utils.session import NEW_SESSION, provide_session
3434

3535
if TYPE_CHECKING:

airflow-core/src/airflow/exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def __getattr__(name: str):
328328
import warnings
329329

330330
from airflow import DeprecatedImportWarning
331-
from airflow.utils.module_loading import import_string
331+
from airflow._shared.module_loading import import_string
332332

333333
target_path = f"airflow.sdk.exceptions.{name}"
334334
warnings.warn(

airflow-core/src/airflow/executors/executor_loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import structlog
2626

27+
from airflow._shared.module_loading import import_string
2728
from airflow.exceptions import AirflowConfigException, UnknownExecutorException
2829
from airflow.executors.executor_constants import (
2930
CELERY_EXECUTOR,
@@ -34,7 +35,6 @@
3435
)
3536
from airflow.executors.executor_utils import ExecutorName
3637
from airflow.models.team import Team
37-
from airflow.utils.module_loading import import_string
3838

3939
log = structlog.get_logger(__name__)
4040

airflow-core/src/airflow/jobs/triggerer_job_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from sqlalchemy import func, select
3939
from structlog.contextvars import bind_contextvars as bind_log_contextvars
4040

41+
from airflow._shared.module_loading import import_string
4142
from airflow._shared.timezones import timezone
4243
from airflow.configuration import conf
4344
from airflow.executors import workloads
@@ -78,7 +79,6 @@
7879
from airflow.triggers import base as events
7980
from airflow.utils.helpers import log_filename_template_renderer
8081
from airflow.utils.log.logging_mixin import LoggingMixin
81-
from airflow.utils.module_loading import import_string
8282
from airflow.utils.session import provide_session
8383

8484
if TYPE_CHECKING:

0 commit comments

Comments
 (0)