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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-standard
-Version: 1.6.0rc1
+Version: 1.7.0rc1
 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>
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.10.0rc1
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.7.0/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.7.0
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -54,9 +54,8 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-standard``
 
-Release: ``1.6.0``
+Release: ``1.7.0``
 
-Release Date: ``|PypiReleaseDate|``
 
 Airflow Standard Provider
 
@@ -68,12 +67,12 @@ This is a provider package for ``standard`` provider. All classes for this provi
 are in ``airflow.providers.standard`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.7.0/>`_.
 
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below
+You can install this package on top of an existing Airflow installation (see ``Requirements`` below
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-standard``
 
@@ -89,5 +88,5 @@ PIP package         Version required
 ==================  ==================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.7.0/changelog.html>`_.
 

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/README.rst

@@ -23,9 +23,8 @@
 
 Package ``apache-airflow-providers-standard``
 
-Release: ``1.6.0``
+Release: ``1.7.0``
 
-Release Date: ``|PypiReleaseDate|``
 
 Airflow Standard Provider
 
@@ -37,12 +36,12 @@ This is a provider package for ``standard`` provider. All classes for this provi
 are in ``airflow.providers.standard`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.7.0/>`_.
 
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below
+You can install this package on top of an existing Airflow installation (see ``Requirements`` below
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-standard``
 
@@ -58,4 +57,4 @@ PIP package         Version required
 ==================  ==================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.7.0/changelog.html>`_.

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

@@ -35,28 +35,85 @@
 Changelog
 ---------
 
+1.7.0
+.....
+
+
+Release Date: ``|PypiReleaseDate|``
+
+Features
+~~~~~~~~
+
+* ``Add options_mapping support to HITLBranchOperator (#55093)``
+* ``feat(hitl): update url generating utility (#55022)``
+* ``feat(hitl): add utility functions for generating the url to required actions page  (#54827)``
+* ``Display a more friendly error when invalid branches are provided to branch operators (#54273)``
+* ``Add owners/actors/respondents to HITLOperators (#54308)``
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Fix ''BranchPythonOperator'' failure when callable returns None (#54991)``
+* ``Fix external_python task failure when ''expect_airflow=False'' (#54809)``
+* ``Fix typos in HITL-related code and comments (#54670)``
+
+Misc
+~~~~
+
+* ``refactor(hitl): rename HITLDetail.user_id as HITLDetail.responded_user_id and add HITLDetail.responded_user_name (#55019)``
+* ``Revert "Fix rendering of template fields with start from trigger" (#55037)``
+* ``Change StartTriggerArgs imports (#54856)``
+* ``Do not use HITLDetailResponse from core in sdk (#54358)``
+* ``Move DagBag to SDK and make it return SDK DAG objects (#53918)``
+* ``Remove MappedOperator inheritance (#53696)``
+
+Doc-only
+~~~~~~~~
+
+* ``Make term Dag consistent in providers docs (#55101)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Remove airflow.models.DAG (#54383)``
+   * ``Fix test_external_python tests setup (#55145)``
+   * ``Move trigger_rule utils from 'airflow/utils'  to 'airflow.task'and integrate with Execution API spec (#53389)``
+   * ``Import documentation with screenshots for HITL (#54618)``
+   * ``Move filesystem sensor tests to standard provider (#54635)``
+   * ``Switch pre-commit to prek (#54258)``
+   * ``docs(hitl): fix typo in example_hitl_operator (#54537)``
+   * ``make bundle_name not nullable (#47592)``
+   * ``Remove SDK BaseOperator in TaskInstance (#53223)``
+
+.. Review and move the new changes to one of the sections above:
+   * ``Fix Airflow 2 reference in README/index of providers (#55240)``
+
 1.6.0
 .....
 
 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 +125,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 +141,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.7.0rc1}/docs/index.rst

@@ -43,7 +43,7 @@
     :maxdepth: 1
     :caption: Resources
 
-    Example DAGs <_api/airflow/providers/standard/example_dags/index>
+    Example Dags <_api/airflow/providers/standard/example_dags/index>
     PyPI Repository <https://pypi.org/project/apache-airflow-providers-standard/>
     Installing from sources <installing-providers-from-sources>
     Python API <_api/airflow/providers/standard/index>
@@ -66,9 +66,7 @@ apache-airflow-providers-standard package
 Airflow Standard Provider
 
 
-Release: 1.6.0
-
-Release Date: ``|PypiReleaseDate|``
+Release: 1.7.0
 
 Provider package
 ----------------
@@ -79,7 +77,7 @@ All classes for this package are included in the ``airflow.providers.standard``
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation via
+You can install this package on top of an existing Airflow installation via
 ``pip install apache-airflow-providers-standard``.
 For the minimum Airflow version supported, see ``Requirements`` below.
 

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/docs/operators/bash.rst

@@ -246,7 +246,7 @@ into a temporary file. By default, the file is placed in a temporary directory
 
 
 To execute a bash script, place it in a location relative to the directory containing
-the DAG file. So if your DAG file is in ``/usr/local/airflow/dags/test_dag.py``, you can
+the Dag file. So if your Dag file is in ``/usr/local/airflow/dags/test_dag.py``, you can
 move your ``test.sh`` file to any location under ``/usr/local/airflow/dags/`` (Example:
 ``/usr/local/airflow/dags/scripts/test.sh``) and pass the relative path to ``bash_command``
 as shown below:
@@ -280,7 +280,7 @@ in files composed in different languages, and general flexibility in structuring
 pipelines.
 
 It is also possible to define your ``template_searchpath`` as pointing to any folder
-locations in the DAG constructor call.
+locations in the Dag constructor call.
 
 .. tab-set::
 
@@ -302,7 +302,7 @@ locations in the DAG constructor call.
         .. code-block:: python
             :emphasize-lines: 1
 
-            with DAG("example_bash_dag", ..., template_searchpath="/opt/scripts"):
+            with Dag("example_bash_dag", ..., template_searchpath="/opt/scripts"):
                 t2 = BashOperator(
                     task_id="bash_example",
                     bash_command="test.sh ",

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/docs/operators/datetime.rst

@@ -24,16 +24,16 @@ Use the :class:`~airflow.providers.standard.operators.datetime.BranchDateTimeOpe
 depending on whether the time falls into the range given by two target arguments,
 
 This operator has two modes. First mode is to use current time (machine clock time at the
-moment the DAG is executed), and the second mode is to use the ``logical_date`` of the DAG run it is run
+moment the Dag is executed), and the second mode is to use the ``logical_date`` of the Dag run it is run
 with.
 
 
 Usage with current time
 -----------------------
 
-The usages above might be useful in certain situations - for example when DAG is used to perform cleanups
-and maintenance and is not really supposed to be used for any DAGs that are supposed to be back-filled,
-because the "current time" make back-filling non-idempotent, its result depend on the time when the DAG
+The usages above might be useful in certain situations - for example when Dag is used to perform cleanups
+and maintenance and is not really supposed to be used for any Dags that are supposed to be back-filled,
+because the "current time" make back-filling non-idempotent, its result depend on the time when the Dag
 actually was run. It's also slightly non-deterministic potentially even if it is run on schedule. It can
 take some time between when the DAGRun was scheduled and executed and it might mean that even if
 the DAGRun was scheduled properly, the actual time used for branching decision will be different than the
@@ -62,8 +62,8 @@ will raise an exception.
 Usage with logical date
 -----------------------
 
-The usage is much more "data range" friendly. The ``logical_date`` does not change when the DAG is re-run and
-it is not affected by execution delays, so this approach is suitable for idempotent DAG runs that might be
+The usage is much more "data range" friendly. The ``logical_date`` does not change when the Dag is re-run and
+it is not affected by execution delays, so this approach is suitable for idempotent Dag runs that might be
 back-filled.
 
 .. exampleinclude:: /../src/airflow/providers/standard/example_dags/example_branch_datetime_operator.py

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/docs/operators/python.rst

@@ -165,7 +165,7 @@ If you want the context related to datetime objects like ``data_interval_start``
 
 
 .. important::
-    The Python function body defined to be executed is cut out of the DAG into a temporary file w/o surrounding code.
+    The Python function body defined to be executed is cut out of the Dag into a temporary file w/o surrounding code.
     As in the examples you need to add all imports again and you can not rely on variables from the global Python context.
 
     If you want to pass variables into the classic :class:`~airflow.providers.standard.operators.python.PythonVirtualenvOperator` use
@@ -194,7 +194,7 @@ pip configuration as described in `pip config <https://pip.pypa.io/en/stable/top
 
 If you want to use additional task specific private python repositories to setup the virtual environment, you can pass the ``index_urls`` parameter which will adjust the
 pip install configurations. Passed index urls replace the standard system configured index url settings.
-To prevent adding secrets to the private repository in your DAG code you can use the Airflow
+To prevent adding secrets to the private repository in your Dag code you can use the Airflow
 :doc:`apache-airflow:authoring-and-scheduling/connections`. For this purpose the connection type ``Package Index (Python)`` can be used.
 In the ``Package Index (Python)`` connection type you can specify the index URL and credentials for the private repository.
 After creating a ``Package Index (Python)`` connection, you can provide the connection ID to the ``PythonVirtualenvOperator`` using the ``index_urls_from_connection_ids`` parameter.
@@ -216,7 +216,7 @@ for each execution.
 
 But still setting up the virtual environment for every execution needs some time. For repeated execution you can set the option ``venv_cache_path`` to a file system
 folder on your worker. In this case the virtual environment will be set up once and be reused. If virtual environment caching is used, per unique requirements set different
-virtual environment subfolders are created in the cache path. So depending on your variations in the DAGs in your system setup sufficient disk space is needed.
+virtual environment subfolders are created in the cache path. So depending on your variations in the Dags in your system setup sufficient disk space is needed.
 
 Note that no automated cleanup is made and in case of cached mode. All worker slots share the same virtual environment but if tasks are scheduled over and over on
 different workers, it might happen that virtual environment are created on multiple workers individually. Also if the worker is started in a Kubernetes POD, a restart
@@ -286,7 +286,7 @@ If you want the context related to datetime objects like ``data_interval_start``
 ``lazy_object_proxy`` to your virtual environment.
 
 .. important::
-    The Python function body defined to be executed is cut out of the DAG into a temporary file w/o surrounding code.
+    The Python function body defined to be executed is cut out of the Dag into a temporary file w/o surrounding code.
     As in the examples you need to add all imports again and you can not rely on variables from the global Python context.
 
     If you want to pass variables into the classic :class:`~airflow.providers.standard.operators.python.ExternalPythonOperator` use

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/docs/operators/trigger_dag_run.rst

@@ -22,7 +22,7 @@
 TriggerDagRunOperator
 =======================
 
-Use the :class:`~airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunOperator` to trigger dag from another dag.
+Use the :class:`~airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunOperator` to trigger Dag from another Dag.
 
 .. exampleinclude:: /../src/airflow/providers/standard/example_dags/example_trigger_controller_dag.py
     :language: python

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/docs/sensors/datetime.rst

@@ -56,7 +56,7 @@ TimeSensor
 
 Use the :class:`~airflow.providers.standard.sensors.time_sensor.TimeSensor` to end sensing after time specified. ``TimeSensor`` can be run in deferrable mode, if a Triggerer is available.
 
-Time will be evaluated against ``data_interval_end`` if present for the dag run, otherwise ``run_after`` will be used.
+Time will be evaluated against ``data_interval_end`` if present for the Dag run, otherwise ``run_after`` will be used.
 
 .. exampleinclude:: /../src/airflow/providers/standard/example_dags/example_sensors.py
     :language: python

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/docs/sensors/external_task_sensor.rst

@@ -15,36 +15,36 @@
     specific language governing permissions and limitations
     under the License.
 
-.. _howto/operator:Cross-DAG Dependencies:
+.. _howto/operator:Cross-Dag Dependencies:
 
-Cross-DAG Dependencies
+Cross-Dag Dependencies
 ======================
 
-When two DAGs have dependency relationships, it is worth considering combining them into a single
-DAG, which is usually simpler to understand. Airflow also offers better visual representation of
-dependencies for tasks on the same DAG. However, it is sometimes not practical to put all related
-tasks on the same DAG. For example:
+When two Dags have dependency relationships, it is worth considering combining them into a single
+Dag, which is usually simpler to understand. Airflow also offers better visual representation of
+dependencies for tasks on the same Dag. However, it is sometimes not practical to put all related
+tasks on the same Dag. For example:
 
-- Two DAGs may have different schedules. E.g. a weekly DAG may have tasks that depend on other tasks
-  on a daily DAG.
-- Different teams are responsible for different DAGs, but these DAGs have some cross-DAG
+- Two Dags may have different schedules. E.g. a weekly Dag may have tasks that depend on other tasks
+  on a daily Dag.
+- Different teams are responsible for different Dags, but these Dags have some cross-Dag
   dependencies.
-- A task may depend on another task on the same DAG, but for a different ``execution_date``
+- A task may depend on another task on the same Dag, but for a different ``execution_date``
   (start of the data interval).
 - Use ``execution_delta`` for tasks running at different times, like ``execution_delta=timedelta(hours=1)``
   to check against a task that runs 1 hour earlier.
 
-``ExternalTaskSensor`` can be used to establish such dependencies across different DAGs. When it is
+``ExternalTaskSensor`` can be used to establish such dependencies across different Dags. When it is
 used together with ``ExternalTaskMarker``, clearing dependent tasks can also happen across different
-DAGs.
+Dags.
 
 ExternalTaskSensor
 ^^^^^^^^^^^^^^^^^^
 
-Use the :class:`~airflow.providers.standard.sensors.external_task.ExternalTaskSensor` to make tasks on a DAG
-wait for another task on a different DAG for a specific ``execution_date``.
+Use the :class:`~airflow.providers.standard.sensors.external_task.ExternalTaskSensor` to make tasks on a Dag
+wait for another task on a different Dag for a specific ``execution_date``.
 
-ExternalTaskSensor also provide options to set if the Task on a remote DAG succeeded or failed
+ExternalTaskSensor also provide options to set if the Task on a remote Dag succeeded or failed
 via ``allowed_states`` and ``failed_states`` parameters.
 
 .. exampleinclude:: /../src/airflow/providers/standard/example_dags/example_external_task_marker_dag.py
@@ -64,8 +64,8 @@ Also for this action you can use sensor in the deferrable mode:
 
 ExternalTaskSensor with task_group dependency
 ---------------------------------------------
-In Addition, we can also use the :class:`~airflow.providers.standard.sensors.external_task.ExternalTaskSensor` to make tasks on a DAG
-wait for another ``task_group`` on a different DAG for a specific ``execution_date``.
+In Addition, we can also use the :class:`~airflow.providers.standard.sensors.external_task.ExternalTaskSensor` to make tasks on a Dag
+wait for another ``task_group`` on a different Dag for a specific ``execution_date``.
 
 .. exampleinclude:: /../src/airflow/providers/standard/example_dags/example_external_task_marker_dag.py
     :language: python

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/provider.yaml

@@ -21,12 +21,13 @@ name: Standard
 description: |
     Airflow Standard Provider
 state: ready
-source-date-epoch: 1754503555
+source-date-epoch: 1756877597
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 1.7.0
   - 1.6.0
   - 1.5.0
   - 1.4.1

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

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-standard"
-version = "1.6.0rc1"
+version = "1.7.0rc1"
 description = "Provider package apache-airflow-providers-standard for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -54,7 +54,7 @@ requires-python = ">=3.10"
 
 # The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
-# Make sure to run ``breeze static-checks --type update-providers-dependencies --all-files``
+# Make sure to run ``prek update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0rc1",
@@ -95,8 +95,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.7.0"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.7.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "1.6.0"
+__version__ = "1.7.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/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.7.0rc1}/src/airflow/providers/standard/example_dags/example_bash_decorator.py

@@ -23,7 +23,12 @@ from airflow.exceptions import AirflowSkipException
 from airflow.providers.standard.operators.empty import EmptyOperator
 from airflow.providers.standard.utils.weekday import WeekDay
 from airflow.sdk import chain, dag, task
-from airflow.utils.trigger_rule import TriggerRule
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 
 @dag(schedule=None, start_date=pendulum.datetime(2023, 1, 1, tz="UTC"), catchup=False)

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/example_dags/example_branch_operator.py

@@ -39,7 +39,12 @@ from airflow.providers.standard.operators.python import (
     PythonVirtualenvOperator,
 )
 from airflow.sdk import DAG, Label
-from airflow.utils.trigger_rule import TriggerRule
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 PATH_TO_PYTHON_BINARY = sys.executable
 

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/example_dags/example_branch_operator_decorator.py

@@ -32,7 +32,12 @@ import pendulum
 
 from airflow.providers.standard.operators.empty import EmptyOperator
 from airflow.sdk import DAG, Label, task
-from airflow.utils.trigger_rule import TriggerRule
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 PATH_TO_PYTHON_BINARY = sys.executable
 

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/example_dags/example_hitl_operator.py

@@ -37,6 +37,7 @@ if TYPE_CHECKING:
 # [START hitl_tutorial]
 
 
+# [START hitl_notifier]
 class LocalLogNotifier(BaseNotifier):
     """Simple notifier to demonstrate HITL notification without setup any connection."""
 
@@ -46,10 +47,14 @@ class LocalLogNotifier(BaseNotifier):
         self.message = message
 
     def notify(self, context: Context) -> None:
+        url = HITLOperator.generate_link_to_ui_from_context(
+            context=context,
+            base_url="http://localhost:28080",
+        )
         self.log.info(self.message)
+        self.log.info("Url to respond %s", url)
 
 
-# [START htil_notifer]
 hitl_request_callback = LocalLogNotifier(
     message="""
 [HITL]
@@ -65,7 +70,7 @@ hitl_success_callback = LocalLogNotifier(
     message="{% set task_id = task.task_id -%}{{ ti.xcom_pull(task_ids=task_id) }}"
 )
 hitl_failure_callback = LocalLogNotifier(message="Request to response to '{{ task.subject }}' failed")
-# [END htil_notifer]
+# [END hitl_notifier]
 
 with DAG(
     dag_id="example_hitl_operator",
@@ -95,7 +100,7 @@ with DAG(
     )
     # [END howto_hitl_operator]
 
-    # [START howto_hitl_operator_muliple]
+    # [START howto_hitl_operator_multiple]
     wait_for_multiple_options = HITLOperator(
         task_id="wait_for_multiple_options",
         subject="Please choose option to proceed: ",
@@ -105,7 +110,7 @@ with DAG(
         on_success_callback=hitl_success_callback,
         on_failure_callback=hitl_failure_callback,
     )
-    # [END howto_hitl_operator_muliple]
+    # [END howto_hitl_operator_multiple]
 
     # [START howto_hitl_operator_timeout]
     wait_for_default_option = HITLOperator(
@@ -127,8 +132,8 @@ with DAG(
         body="""
         Input: {{ ti.xcom_pull(task_ids='wait_for_input')["params_input"]["information"] }}
         Option: {{ ti.xcom_pull(task_ids='wait_for_option')["chosen_options"] }}
-        Multiple Options: {{ ti.xcom_pull(task_ids='wait_for_option')["chosen_options"] }}
-        Timeout Option: {{ ti.xcom_pull(task_ids='wait_for_option')["chosen_options"] }}
+        Multiple Options: {{ ti.xcom_pull(task_ids='wait_for_multiple_options')["chosen_options"] }}
+        Timeout Option: {{ ti.xcom_pull(task_ids='wait_for_default_option')["chosen_options"] }}
         """,
         defaults="Reject",
         execution_timeout=datetime.timedelta(minutes=1),

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/example_dags/example_sensors.py

@@ -30,7 +30,12 @@ from airflow.providers.standard.sensors.time_delta import TimeDeltaSensor
 from airflow.providers.standard.sensors.weekday import DayOfWeekSensor
 from airflow.providers.standard.utils.weekday import WeekDay
 from airflow.sdk import DAG
-from airflow.utils.trigger_rule import TriggerRule
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 
 # [START example_callables]

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/example_dags/example_short_circuit_decorator.py

@@ -22,7 +22,12 @@ import pendulum
 
 from airflow.providers.standard.operators.empty import EmptyOperator
 from airflow.sdk import chain, dag, task
-from airflow.utils.trigger_rule import TriggerRule
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 
 @dag(schedule=None, start_date=pendulum.datetime(2021, 1, 1, tz="UTC"), catchup=False, tags=["example"])

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/example_dags/example_short_circuit_operator.py

@@ -24,7 +24,12 @@ import pendulum
 from airflow.providers.standard.operators.empty import EmptyOperator
 from airflow.providers.standard.operators.python import ShortCircuitOperator
 from airflow.sdk import DAG, chain
-from airflow.utils.trigger_rule import TriggerRule
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 with DAG(
     dag_id="example_short_circuit_operator",

{apache_airflow_providers_standard-1.6.0rc1 → apache_airflow_providers_standard-1.7.0rc1}/src/airflow/providers/standard/exceptions.py

@@ -62,4 +62,4 @@ class HITLTriggerEventError(AirflowException):
 
 
 class HITLTimeoutError(HITLTriggerEventError):
-    """Raised when HILTOperator timeouts."""
+    """Raised when HITLOperator timeouts."""