You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by am...@apache.org on 2025/05/20 06:14:02 UTC
(airflow) branch backport-f008411-v3-0-test created (now 6ada3869822)
This is an automated email from the ASF dual-hosted git repository.
amoghdesai pushed a change to branch backport-f008411-v3-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
at 6ada3869822 [v3-0-test] Support macros defined via plugins in Airflow 3 (#50642) (cherry picked from commit f008411fbd9679c2abbdc471e2a003e4f65e705e)
This branch includes the following new commits:
new 6ada3869822 [v3-0-test] Support macros defined via plugins in Airflow 3 (#50642) (cherry picked from commit f008411fbd9679c2abbdc471e2a003e4f65e705e)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(airflow) 01/01: [v3-0-test] Support macros defined via plugins in Airflow 3 (#50642) (cherry picked from commit f008411fbd9679c2abbdc471e2a003e4f65e705e)
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amoghdesai pushed a commit to branch backport-f008411-v3-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 6ada3869822a56d3bb6f88143783d74a3fd56364
Author: Amogh Desai <am...@gmail.com>
AuthorDate: Mon May 19 20:26:39 2025 +0530
[v3-0-test] Support macros defined via plugins in Airflow 3 (#50642)
(cherry picked from commit f008411fbd9679c2abbdc471e2a003e4f65e705e)
Co-authored-by: Amogh Desai <am...@gmail.com>
---
.../docs/administration-and-deployment/plugins.rst | 3 +--
airflow-core/src/airflow/plugins_manager.py | 4 ++--
airflow-core/tests/unit/plugins/test_plugins_manager.py | 15 ++++++++-------
task-sdk/src/airflow/sdk/execution_time/task_runner.py | 3 +++
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/airflow-core/docs/administration-and-deployment/plugins.rst b/airflow-core/docs/administration-and-deployment/plugins.rst
index 1735d0f6532..39f926fda42 100644
--- a/airflow-core/docs/administration-and-deployment/plugins.rst
+++ b/airflow-core/docs/administration-and-deployment/plugins.rst
@@ -171,8 +171,7 @@ definitions in Airflow.
from airflow.providers.amazon.aws.transfers.gcs_to_s3 import GCSToS3Operator
- # Will show up under airflow.macros.test_plugin.plugin_macro
- # and in templates through {{ macros.test_plugin.plugin_macro }}
+ # Will show up in templates through {{ macros.test_plugin.plugin_macro }}
def plugin_macro():
pass
diff --git a/airflow-core/src/airflow/plugins_manager.py b/airflow-core/src/airflow/plugins_manager.py
index 34d8f100d75..a83236ea0c8 100644
--- a/airflow-core/src/airflow/plugins_manager.py
+++ b/airflow-core/src/airflow/plugins_manager.py
@@ -507,7 +507,7 @@ def integrate_macros_plugins() -> None:
global plugins
global macros_modules
- from airflow import macros
+ from airflow.sdk.definitions import macros
if macros_modules is not None:
return
@@ -525,7 +525,7 @@ def integrate_macros_plugins() -> None:
if plugin.name is None:
raise AirflowPluginException("Invalid plugin name")
- macros_module = make_module(f"airflow.macros.{plugin.name}", plugin.macros)
+ macros_module = make_module(f"airflow.sdk.definitions.macros.{plugin.name}", plugin.macros)
if macros_module:
macros_modules.append(macros_module)
diff --git a/airflow-core/tests/unit/plugins/test_plugins_manager.py b/airflow-core/tests/unit/plugins/test_plugins_manager.py
index 87564a63baf..28843faa702 100644
--- a/airflow-core/tests/unit/plugins/test_plugins_manager.py
+++ b/airflow-core/tests/unit/plugins/test_plugins_manager.py
@@ -228,17 +228,18 @@ class TestPluginsManager:
"""
Tests whether macros that originate from plugins are being registered correctly.
"""
- from airflow import macros
from airflow.plugins_manager import integrate_macros_plugins
+ from airflow.sdk.definitions import macros
def cleanup_macros():
- """Reloads the airflow.macros module such that the symbol table is reset after the test."""
+ """Reloads the macros module such that the symbol table is reset after the test."""
# We're explicitly deleting the module from sys.modules and importing it again
# using import_module() as opposed to using importlib.reload() because the latter
- # does not undo the changes to the airflow.macros module that are being caused by
+ # does not undo the changes to the airflow.sdk.definitions.macros module that are being caused by
# invoking integrate_macros_plugins()
- del sys.modules["airflow.macros"]
- importlib.import_module("airflow.macros")
+
+ del sys.modules["airflow.sdk.definitions.macros"]
+ importlib.import_module("airflow.sdk.definitions.macros")
request.addfinalizer(cleanup_macros)
@@ -253,12 +254,12 @@ class TestPluginsManager:
# Ensure the macros for the plugin have been integrated.
integrate_macros_plugins()
# Test whether the modules have been created as expected.
- plugin_macros = importlib.import_module(f"airflow.macros.{MacroPlugin.name}")
+ plugin_macros = importlib.import_module(f"airflow.sdk.definitions.macros.{MacroPlugin.name}")
for macro in MacroPlugin.macros:
# Verify that the macros added by the plugin are being set correctly
# on the plugin's macro module.
assert hasattr(plugin_macros, macro.__name__)
- # Verify that the symbol table in airflow.macros has been updated with an entry for
+ # Verify that the symbol table in airflow.sdk.definitions.macros has been updated with an entry for
# this plugin, this is necessary in order to allow the plugin's macros to be used when
# rendering templates.
assert hasattr(macros, MacroPlugin.name)
diff --git a/task-sdk/src/airflow/sdk/execution_time/task_runner.py b/task-sdk/src/airflow/sdk/execution_time/task_runner.py
index 66a3d02cd8c..630b5cb8a84 100644
--- a/task-sdk/src/airflow/sdk/execution_time/task_runner.py
+++ b/task-sdk/src/airflow/sdk/execution_time/task_runner.py
@@ -151,6 +151,9 @@ class RuntimeTaskInstance(TaskInstance):
def get_template_context(self) -> Context:
# TODO: Move this to `airflow.sdk.execution_time.context`
# once we port the entire context logic from airflow/utils/context.py ?
+ from airflow.plugins_manager import integrate_macros_plugins
+
+ integrate_macros_plugins()
dag_run_conf: dict[str, Any] | None = None
if from_server := self._ti_context_from_server: