Two fixes for the execution related to pytask-latex. (#7)

Author: tobiasraabe

docs/changes.rst

@@ -6,6 +6,14 @@ chronological order. Releases follow `semantic versioning <https://semver.org/>`
 all releases are available on `Anaconda.org <https://anaconda.org/pytask/pytask>`_.
 
 
+0.0.3 - 2020-07-19
+------------------
+
+- :gh:`7` makes pytask exit with code 1 if a task failed and the
+  ``skip_ancestor_failed`` decorator is only applied to descendant tasks not the task
+  itself.
+
+
 0.0.2 - 2020-07-17
 ------------------
 

src/pytask/dag.py

@@ -9,12 +9,16 @@ def sort_tasks_topologically(dag):
             yield node
 
 
-def task_and_descending_tasks(task_name, dag):
-    yield task_name
+def descending_tasks(task_name, dag):
     for descendant in nx.descendants(dag, task_name):
         if "task" in dag.nodes[descendant]:
             yield descendant
 
 
+def task_and_descending_tasks(task_name, dag):
+    yield task_name
+    yield from descending_tasks(task_name, dag)
+
+
 def node_and_neigbors(dag, node):
     return itertools.chain([node], dag.neighbors(node))

src/pytask/exceptions.py

@@ -18,5 +18,9 @@ class ResolvingDependenciesError(PytaskError):
     """Exception during resolving dependencies."""
 
 
+class ExecutionError(PytaskError):
+    """Exception during execution."""
+
+
 class TaskDuplicatedError(PytaskError):
     """Exception for duplicated task during collection."""

src/pytask/execute.py

@@ -6,10 +6,11 @@
 import click
 import pytask
 from pytask import hookimpl
+from pytask.dag import descending_tasks
 from pytask.dag import node_and_neigbors
 from pytask.dag import sort_tasks_topologically
-from pytask.dag import task_and_descending_tasks
 from pytask.database import create_or_update_state
+from pytask.exceptions import ExecutionError
 from pytask.exceptions import NodeNotFoundError
 from pytask.mark import Mark
 from pytask.nodes import FilePathNode
@@ -116,7 +117,7 @@ def pytask_execute_task_process_report(session, report):
     if report.success:
         _update_states_in_database(session.dag, task.name)
     else:
-        for descending_task_name in task_and_descending_tasks(task.name, session.dag):
+        for descending_task_name in descending_tasks(task.name, session.dag):
             descending_task = session.dag.nodes[descending_task_name]["task"]
             descending_task.markers.append(
                 Mark(
@@ -125,7 +126,6 @@ def pytask_execute_task_process_report(session, report):
                     {"reason": f"Previous task '{task.name}' failed."},
                 )
             )
-
     return True
 
 
@@ -161,6 +161,9 @@ def pytask_execute_log_end(session, reports):
         format_execute_footer(n_successful, n_failed, duration, tm_width), nl=True
     )
 
+    if n_failed:
+        raise ExecutionError
+
     return True
 
 

src/pytask/main.py

@@ -6,6 +6,7 @@
 from pytask.database import create_database
 from pytask.enums import ExitCode
 from pytask.exceptions import CollectionError
+from pytask.exceptions import ExecutionError
 from pytask.exceptions import ResolvingDependenciesError
 from pytask.pluginmanager import get_plugin_manager
 
@@ -63,8 +64,10 @@ def main(config_from_cli):
     except ResolvingDependenciesError:
         session.exit_code = ExitCode.RESOLVING_DEPENDENCIES_FAILED
 
-    except Exception as e:
+    except ExecutionError:
         session.exit_code = ExitCode.FAILED
+
+    except Exception as e:
         if config["pdb"]:
             pdb.post_mortem()
         else:

src/pytask/parametrize.py

@@ -164,7 +164,7 @@ def _generate_product_of_names_and_functions(
         )
 
         # Convert parametrized dependencies and products to decorator.
-        func = copy.deepcopy(_copy_func(obj))
+        func = _copy_func(obj)
         func.pytestmark = copy.deepcopy(obj.pytestmark)
 
         for marker_name in ["depends_on", "produces"]:
@@ -188,7 +188,7 @@ def _to_tuple(x):
 
 
 def _copy_func(f):
-    """Based on http://stackoverflow.com/a/6528148/190597 (Glenn Maynard)"""
+    """Based on https://stackoverflow.com/a/13503277/7523785."""
     g = types.FunctionType(
         f.__code__,
         f.__globals__,

src/pytask/skipping.py

@@ -1,6 +1,6 @@
 import click
 import pytask
-from pytask.dag import task_and_descending_tasks
+from pytask.dag import descending_tasks
 from pytask.mark import get_markers_from_task
 from pytask.mark import Mark
 from pytask.outcomes import Skipped
@@ -26,16 +26,20 @@ def pytask_execute_task_setup(task):
 
 @pytask.hookimpl
 def pytask_execute_task_process_report(session, report):
+    task = report.task
+
     if report.exc_info and isinstance(report.exc_info[1], SkippedUnchanged):
         report.success = True
 
     elif report.exc_info and isinstance(report.exc_info[1], Skipped):
         report.success = True
-        for descending_task_name in task_and_descending_tasks(
-            report.task.name, session.dag
-        ):
+        for descending_task_name in descending_tasks(report.task.name, session.dag):
             descending_task = session.dag.nodes[descending_task_name]["task"]
-            descending_task.markers.append(Mark("skip", (), {},))
+            descending_task.markers.append(
+                Mark(
+                    "skip", (), {"reason": f"Previous task '{task.name}' was skipped."},
+                )
+            )
 
     elif report.exc_info and isinstance(report.exc_info[1], SkippedAncestorFailed):
         report.success = False