apache-airflow-providers-standard 1.6.0rc1__tar.gz → 1.6.0rc2__tar.gz

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-standard
-Version: 1.6.0rc1
+Version: 1.6.0rc2
 Summary: Provider package apache-airflow-providers-standard for Apache Airflow
 Keywords: airflow-provider,standard,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/docs/changelog.rst

@@ -41,22 +41,27 @@ Changelog
 Features
 ~~~~~~~~
 
-* ``feat(htil): add 'notifiers' to HITLOperator (#54128)``
-* ``feat(hitl): add HITLBranchOperator (#53960)``
+* ``feat(HITL): add 'notifiers' to HITLOperator (#54128)``
+* ``feat(HITL): add HITLBranchOperator (#53960)``
 * ``feat(HITL): improve hitl trigger logging message (#53850)``
-* ``feat(hitl): add "timedout" column to HITLTriggerEventSuccessPayload (#53852)``
+* ``feat(HITL): add "timedout" column to HITLTriggerEventSuccessPayload (#53852)``
 
 Bug Fixes
 ~~~~~~~~~
 
 * ``Restore 'execute_complete' functionality 'TimeSensor' when 'deferrable=True' (#53669)``
 * ``Fix several deprecation warnings related to airflow.sdk (#53791)``
+* ``Fix pycache_cleanup path handling in PythonVirtualenvOperator (#54214)``
+* ``fix(HITL): guard empty options or chosen_options when writing response (#54355)``
 
 Misc
 ~~~~
 
-* ``refactor(hitl): replace timezone usage with airflow.sdk.timezone (#53962)``
+* ``refactor(HITL): replace timezone usage with airflow.sdk.timezone (#53962)``
 * ``refactor(HITL): make default options class variables to avoid typo (#53849)``
+* ``Add a warning about python interpreter using with uv (#54262)``
+* ``Introduce 'StdoutCaptureManager' to isolate stdout from 'logging' logs (#54065)``
+* ``Move some items in 'airflow.utils.context' to appropriate places (#53600)``
 
 Doc-only
 ~~~~~~~~
@@ -68,6 +73,7 @@ Doc-only
    * ``Documentation for Human-in-the-loop operator (#53694)``
    * ``Correct HITL version warnings to avoid confusion (#53876)``
    * ``Move functions in 'airflow.utils.decorator' to more appropriate places (#53420)``
+   * ``Prepare release for Aug 2025 1st wave of providers (#54193)``
 
 1.5.0
 .....
@@ -83,8 +89,8 @@ Bug Fixes
 
 * ``Fix key error in _handle_execution_date_fn for ExternalTaskSensor (#53728)``
 * ``fix: Type mismatch for DateInterval in latest only operator (#53541)``
-* ``fix(hitl): Fix HITLEntryOperator "options" and "defaults" handling (#53184)``
-* ``fix(hitl): handle hitl details when task instance is retried (#53824)``
+* ``fix(HITL): Fix HITLEntryOperator "options" and "defaults" handling (#53184)``
+* ``fix(HITL): handle hitl details when task instance is retried (#53824)``
 
 Misc
 ~~~~

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-standard"
-version = "1.6.0rc1"
+version = "1.6.0rc2"
 description = "Provider package apache-airflow-providers-standard for Apache Airflow"
 readme = "README.rst"
 authors = [

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/decorators/bash.py

@@ -33,8 +33,8 @@ else:
     )
 
 from airflow.providers.standard.operators.bash import BashOperator
+from airflow.providers.standard.version_compat import context_merge
 from airflow.sdk.definitions._internal.types import SET_DURING_EXECUTION
-from airflow.utils.context import context_merge
 from airflow.utils.operator_helpers import determine_kwargs
 
 if TYPE_CHECKING:

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/operators/hitl.py

@@ -84,8 +84,13 @@ class HITLOperator(BaseOperator):
             [notifiers] if isinstance(notifiers, BaseNotifier) else notifiers or []
         )
 
+        self.validate_options()
         self.validate_defaults()
 
+    def validate_options(self) -> None:
+        if not self.options:
+            raise ValueError('"options" cannot be empty.')
+
     def validate_defaults(self) -> None:
         """
         Validate whether the given defaults pass the following criteria.

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/operators/python.py

@@ -51,9 +51,8 @@ from airflow.exceptions import (
 from airflow.models.variable import Variable
 from airflow.providers.standard.hooks.package_index import PackageIndexHook
 from airflow.providers.standard.utils.python_virtualenv import prepare_virtualenv, write_python_script
-from airflow.providers.standard.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperator
+from airflow.providers.standard.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperator, context_merge
 from airflow.utils import hashlib_wrapper
-from airflow.utils.context import context_copy_partial, context_merge
 from airflow.utils.file import get_unique_dag_module_name
 from airflow.utils.operator_helpers import KeywordParameters
 from airflow.utils.process_utils import execute_in_subprocess
@@ -487,7 +486,8 @@ class _BasePythonVirtualenvOperator(PythonOperator, metaclass=ABCMeta):
 
     def execute(self, context: Context) -> Any:
         serializable_keys = set(self._iter_serializable_context_keys())
-        serializable_context = context_copy_partial(context, serializable_keys)
+        new = {k: v for k, v in context.items() if k in serializable_keys}
+        serializable_context = cast("Context", new)
         return super().execute(context=serializable_context)
 
     def get_python_source(self):
@@ -889,9 +889,9 @@ class PythonVirtualenvOperator(_BasePythonVirtualenvOperator):
 
         with TemporaryDirectory(prefix="venv") as tmp_dir:
             tmp_path = Path(tmp_dir)
-            tmp_dir, temp_venv_dir = tmp_path.relative_to(tmp_path.anchor).parts
             custom_pycache_prefix = Path(sys.pycache_prefix or "")
-            venv_python_cache_dir = Path.cwd() / custom_pycache_prefix / tmp_dir / temp_venv_dir
+            r_path = tmp_path.relative_to(tmp_path.anchor)
+            venv_python_cache_dir = Path.cwd() / custom_pycache_prefix / r_path
             self._prepare_venv(tmp_path)
             python_path = tmp_path / "bin" / "python"
             result = self._execute_python_callable_in_subprocess(python_path)

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/sensors/python.py

@@ -20,8 +20,7 @@ from __future__ import annotations
 from collections.abc import Callable, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
-from airflow.providers.standard.version_compat import BaseSensorOperator, PokeReturnValue
-from airflow.utils.context import context_merge
+from airflow.providers.standard.version_compat import BaseSensorOperator, PokeReturnValue, context_merge
 from airflow.utils.operator_helpers import determine_kwargs
 
 if TYPE_CHECKING:
@@ -29,7 +28,7 @@ if TYPE_CHECKING:
         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.utils.context import Context  # type: ignore[no-redef, attr-defined]
 
 
 class PythonSensor(BaseSensorOperator):

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/triggers/temporal.py

@@ -24,7 +24,11 @@ from typing import Any
 import pendulum
 
 from airflow.triggers.base import BaseTrigger, TaskSuccessEvent, TriggerEvent
-from airflow.utils import timezone
+
+try:
+    from airflow.sdk import timezone
+except ImportError:
+    from airflow.utils import timezone  # type: ignore[attr-defined,no-redef]
 
 
 class DateTimeTrigger(BaseTrigger):

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/utils/python_virtualenv.py

@@ -21,6 +21,7 @@ from __future__ import annotations
 
 import os
 import shutil
+import warnings
 from pathlib import Path
 
 import jinja2
@@ -55,6 +56,15 @@ def _use_uv() -> bool:
 
 def _generate_uv_cmd(tmp_dir: str, python_bin: str, system_site_packages: bool) -> list[str]:
     """Build the command to install the venv via UV."""
+    if python_bin == "python" or python_bin == "python3":
+        python_interpreter_exists = bool(shutil.which(python_bin))
+        if not python_interpreter_exists:
+            warnings.warn(
+                f"uv trying to use `{python_bin}` as the python interpreter. it could lead to errors if the python interpreter not found in PATH. "
+                f"please specify python_version in operator.",
+                UserWarning,
+                stacklevel=3,
+            )
     cmd = ["uv", "venv", "--allow-existing", "--seed", "--python", python_bin]
     if system_site_packages:
         cmd.append("--system-site-packages")

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/src/airflow/providers/standard/version_compat.py

@@ -40,9 +40,11 @@ AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 # even though it wasn't used.
 if AIRFLOW_V_3_1_PLUS:
     from airflow.sdk import BaseHook, BaseOperator
+    from airflow.sdk.definitions.context import context_merge
 else:
     from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
     from airflow.models.baseoperator import BaseOperator  # type: ignore[no-redef]
+    from airflow.utils.context import context_merge  # type: ignore[no-redef, attr-defined]
 
 if AIRFLOW_V_3_0_PLUS:
     from airflow.sdk import BaseOperatorLink
@@ -59,4 +61,5 @@ __all__ = [
     "BaseHook",
     "BaseSensorOperator",
     "PokeReturnValue",
+    "context_merge",
 ]

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/tests/unit/standard/operators/test_hitl.py

@@ -55,6 +55,30 @@ INTERVAL = datetime.timedelta(hours=12)
 
 
 class TestHITLOperator:
+    def test_validate_options(self) -> None:
+        hitl_op = HITLOperator(
+            task_id="hitl_test",
+            subject="This is subject",
+            options=["1", "2", "3", "4", "5"],
+            body="This is body",
+            defaults=["1"],
+            multiple=False,
+            params=ParamsDict({"input_1": 1}),
+        )
+        hitl_op.validate_defaults()
+
+    def test_validate_options_with_empty_options(self) -> None:
+        with pytest.raises(ValueError, match='"options" cannot be empty.'):
+            HITLOperator(
+                task_id="hitl_test",
+                subject="This is subject",
+                options=[],
+                body="This is body",
+                defaults=["1"],
+                multiple=False,
+                params=ParamsDict({"input_1": 1}),
+            )
+
     def test_validate_defaults(self) -> None:
         hitl_op = HITLOperator(
             task_id="hitl_test",

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.6.0rc2}/tests/unit/standard/operators/test_python.py

@@ -63,7 +63,11 @@ from airflow.providers.standard.operators.python import (
     get_current_context,
 )
 from airflow.providers.standard.utils.python_virtualenv import execute_in_subprocess, prepare_virtualenv
-from airflow.utils import timezone
+
+try:
+    from airflow.sdk import timezone
+except ImportError:
+    from airflow.utils import timezone  # type: ignore[attr-defined,no-redef]
 from airflow.utils.session import create_session
 from airflow.utils.state import DagRunState, State, TaskInstanceState
 from airflow.utils.trigger_rule import TriggerRule
@@ -1672,7 +1676,7 @@ class TestPythonVirtualenvOperator(BaseTestPythonVirtualenvOperator):
     ):
         custom_pycache_prefix = "custom/__pycache__"
         tempdir_name = "tmp"
-        venv_dir_temp_name = "venvrandom"
+        venv_dir_temp_name = "dummy12345/venvrandom"
         venv_path_tmp = f"/{tempdir_name}/{venv_dir_temp_name}"
         expected_cleanup_path = Path.cwd() / custom_pycache_prefix / tempdir_name / venv_dir_temp_name