renamed FunctionTask -> PythonTask and ShellCommandTask -> ShellTask …

…for consistent naming convention with Spec & Outputs classes

pydra/design/python.py

@@ -102,7 +102,7 @@ def define(
     auto_attribs : bool
         Whether to use auto_attribs mode when creating the class.
     """
-    from pydra.engine.task import FunctionTask
+    from pydra.engine.task import PythonTask
     from pydra.engine.specs import PythonSpec, PythonOutputs
 
     def make(wrapped: ty.Callable | type) -> PythonSpec:
@@ -143,7 +143,7 @@ def make(wrapped: ty.Callable | type) -> PythonSpec:
         interface = make_task_spec(
             PythonSpec,
             PythonOutputs,
-            FunctionTask,
+            PythonTask,
             parsed_inputs,
             parsed_outputs,
             name=name,

pydra/design/shell.py

@@ -1,4 +1,4 @@
-"""Decorators and helper functions to create ShellCommandTasks used in Pydra workflows"""
+"""Decorators and helper functions to create ShellTasks used in Pydra workflows"""
 
 from __future__ import annotations
 import typing as ty
@@ -254,7 +254,7 @@ def define(
     ShellSpec
         The interface for the shell command
     """
-    from pydra.engine.task import ShellCommandTask
+    from pydra.engine.task import ShellTask
     from pydra.engine.specs import ShellSpec, ShellOutputs
 
     def make(
@@ -339,7 +339,7 @@ def make(
         interface = make_task_spec(
             ShellSpec,
             ShellOutputs,
-            ShellCommandTask,
+            ShellTask,
             parsed_inputs,
             parsed_outputs,
             name=class_name,

pydra/engine/boutiques.py

@@ -6,12 +6,12 @@
 from functools import reduce
 
 from pydra.utils.messenger import AuditFlag
-from pydra.engine.task import ShellCommandTask
+from pydra.engine.task import ShellTask
 from pydra.engine.specs import SpecInfo, ShellSpec, ShellOutputs, File, attrs_fields
 from .helpers_file import is_local_file
 
 
-class BoshTask(ShellCommandTask):
+class BoshTask(ShellTask):
     """Shell Command Task based on the Boutiques descriptor"""
 
     def __init__(

pydra/engine/task.py

@@ -70,7 +70,7 @@
 from .environments import Native
 
 
-class FunctionTask(Task):
+class PythonTask(Task):
     """Wrap a Python callable as a task element."""
 
     def _run_task(self, environment=None):
@@ -95,7 +95,7 @@ def _run_task(self, environment=None):
             )
 
 
-class ShellCommandTask(Task):
+class ShellTask(Task):
     """Wrap a shell command as a task element."""
 
     def __init__(

pydra/mark/functions.py

@@ -30,7 +30,7 @@ def decorate(func):
 
 def task(func):
     """
-    Promote a function to a :class:`~pydra.engine.task.FunctionTask`.
+    Promote a function to a :class:`~pydra.engine.task.PythonTask`.
 
     Example
     -------
@@ -40,10 +40,10 @@ def task(func):
     ...     return a ** 2.0
 
     """
-    from pydra.engine.task import FunctionTask
+    from pydra.engine.task import PythonTask
 
     @wraps(func)
     def decorate(**kwargs):
-        return FunctionTask(func=func, **kwargs)
+        return PythonTask(func=func, **kwargs)
 
     return decorate

pydra/mark/shell.py

@@ -1,4 +1,4 @@
-"""Decorators and helper functions to create ShellCommandTasks used in Pydra workflows"""
+"""Decorators and helper functions to create ShellTasks used in Pydra workflows"""
 
 from __future__ import annotations
 import typing as ty
@@ -93,7 +93,7 @@ def ensure_base_included(base_class: type, bases_list: list[type]):
                     pass
 
         # Ensure bases are lists and can be modified
-        ensure_base_included(pydra.engine.task.ShellCommandTask, bases)
+        ensure_base_included(pydra.engine.task.ShellTask, bases)
         ensure_base_included(pydra.engine.specs.ShellSpec, inputs_bases)
         ensure_base_included(pydra.engine.specs.ShellOutputs, outputs_bases)
 
@@ -140,8 +140,8 @@ def convert_to_attrs(fields: dict[str, dict[str, ty.Any]], attrs_func):
         name = klass.__name__
 
         bases = [klass]
-        if not issubclass(klass, pydra.engine.task.ShellCommandTask):
-            bases.append(pydra.engine.task.ShellCommandTask)
+        if not issubclass(klass, pydra.engine.task.ShellTask):
+            bases.append(pydra.engine.task.ShellTask)
 
         try:
             executable = klass.executable

pydra/utils/tests/utils.py

@@ -1,7 +1,7 @@
 from fileformats.generic import File
 from fileformats.core.mixin import WithSeparateHeader, WithMagicNumber
 from pydra import mark
-from pydra.engine.task import ShellCommandTask
+from pydra.engine.task import ShellTask
 from pydra.engine import specs
 
 
@@ -69,7 +69,7 @@ def generic_func_task(in_file: File) -> File:
 )
 
 
-class GenericShellTask(ShellCommandTask):
+class GenericShellTask(ShellTask):
     input_spec = generic_shell_input_spec
     output_spec = generic_shelloutput_spec
     executable = "echo"
@@ -121,7 +121,7 @@ def specific_func_task(in_file: MyFormatX) -> MyFormatX:
 )
 
 
-class SpecificShellTask(ShellCommandTask):
+class SpecificShellTask(ShellTask):
     input_spec = specific_shell_input_spec
     output_spec = specific_shelloutput_spec
     executable = "echo"
@@ -175,7 +175,7 @@ def other_specific_func_task(in_file: MyOtherFormatX) -> MyOtherFormatX:
 )
 
 
-class OtherSpecificShellTask(ShellCommandTask):
+class OtherSpecificShellTask(ShellTask):
     input_spec = other_specific_shell_input_spec
     output_spec = other_specific_shelloutput_spec
     executable = "echo"