lsst-ctrl-bps-parsl 30.0.0rc2__py3-none-any.whl → 30.0.1rc1__py3-none-any.whl

lsst/ctrl/bps/parsl/configuration.py

@@ -89,32 +89,32 @@ def get_bps_config_value(
 
     Parameters
     ----------
-    config : `BpsConfig`
+    config : `lsst.ctrl.bps.BpsConfig`
         Configuration from which to retrieve value.
     key : `str`
         Key name.
     dataType : `type`
         We require that the returned value have this type.
-    default : optional
+    default : `typing.Any`, optional
         Default value to be provided if ``key`` doesn't exist in the
         ``config``. A default value of `None` means that there is no default.
     required : `bool`, optional
-        If ``True``, the returned value may come from the configuration or from
+        If `True`, the returned value may come from the configuration or from
         the default, but it may not be `None`.
 
     Returns
     -------
-    value
-        Value for ``key`` in the `config`` if it exists, otherwise ``default``,
-        if provided.
+    `type` or `None`
+        Value for ``key`` in the ``config`` if it exists, otherwise
+        ``default``, if provided.
 
     Raises
     ------
     KeyError
-        If ``key`` is not in ``config`` and no default is provided but a value
-        is ``required``.
+        Raised if ``key`` is not in ``config`` and no default is provided but
+        a value is ``required``.
     RuntimeError
-        If the value is not set or is of the wrong type.
+        Raised if the value is not set or is of the wrong type.
     """
     options: dict[str, Any] = {"expandEnvVars": True, "replaceVars": True, "required": required}
     if default is not None:
@@ -138,7 +138,7 @@ def get_workflow_name(config: BpsConfig) -> str:
 
     Parameters
     ----------
-    config : `BpsConfig`
+    config : `lsst.ctrl.bps.BpsConfig`
         BPS configuration.
 
     Returns
@@ -177,7 +177,7 @@ def set_parsl_logging(config: BpsConfig) -> int:
 
     Parameters
     ----------
-    config : `BpsConfig`
+    config : `lsst.ctrl.bps.BpsConfig`
         BPS configuration.
 
     Returns

lsst/ctrl/bps/parsl/job.py

@@ -35,7 +35,7 @@ from textwrap import dedent
 from typing import Any
 
 from parsl.app.bash import BashApp
-from parsl.app.futures import Future
+from parsl.dataflow.futures import AppFuture
 
 from lsst.ctrl.bps import BpsConfig, GenericWorkflow, GenericWorkflowJob
 
@@ -49,7 +49,7 @@ _file_regex = re.compile(r"<FILE:(\S+)>")  # Regex for replacing <FILE:WHATEVER>
 
 def run_command(
     command_line: str,
-    inputs: Sequence[Future] = (),
+    inputs: Sequence[AppFuture] = (),
     stdout: str | None = None,
     stderr: str | None = None,
     parsl_resource_specification: dict[str, Any] | None = None,
@@ -58,13 +58,14 @@ def run_command(
 
     This function exists to get information into parsl, through the ``inputs``,
     ``stdout`` and ``stderr`` parameters. It needs to be wrapped by a parsl
-    ``bash_app`` decorator before use, after which it will return a `Future`.
+    ``bash_app`` decorator before use, after which it will return a
+    `parsl.dataflow.futures.AppFuture`.
 
     Parameters
     ----------
     command_line : `str`
         Command-line to have parsl run.
-    inputs : list of `Future`
+    inputs : `list` [`parsl.dataflow.futures.AppFuture`]
         Other commands that must have run before this.
     stdout, stderr : `str`, optional
         Filenames for stdout and stderr.
@@ -84,7 +85,7 @@ def get_file_paths(workflow: GenericWorkflow, name: str) -> dict[str, str]:
 
     Parameters
     ----------
-    workflow : `GenericWorkflow`
+    workflow : `lsst.ctrl.bps.GenericWorkflow`
         BPS workflow that knows the file paths.
     name : `str`
         Job name.
@@ -102,9 +103,9 @@ class ParslJob:
 
     Parameters
     ----------
-    generic : `GenericWorkflowJob`
+    generic : `lsst.ctrl.bps.GenericWorkflowJob`
         BPS job information.
-    config : `BpsConfig`
+    config : `lsst.ctrl.bps.BpsConfig`
         BPS configuration.
     file_paths : `dict` mapping `str` to `str`
         File paths for job, indexed by symbolic name.
@@ -237,20 +238,27 @@ class ParslJob:
             ("request_cpus", "cores", None),
             ("request_disk", "disk", None),  # Both are MB
             ("request_walltime", "running_time_min", None),  # Both are minutes
+            ("priority", "priority", None),
         ):
             value = getattr(self.generic, bps_name)
-            if scale is not None:
+            if value is not None and scale is not None:
                 value *= scale
-            resources[parsl_name] = value
+            # Parsl's `HighThroughputExecutor` cannot have
+            # `priority=None`, but it can be omitted.  By contrast,
+            # `WorkQueueExecutor` needs to have the other resource
+            # requests provided, but `priority` can be omitted, so we
+            # need special handling for `priority`.
+            if (parsl_name == "priority" and value is not None) or parsl_name != "priority":
+                resources[parsl_name] = value
         return resources
 
     def get_future(
         self,
         app: BashApp,
-        inputs: list[Future],
+        inputs: list[AppFuture],
         command_prefix: str | None = None,
-        add_resources: bool = False,
-    ) -> Future | None:
+        resource_list: list | None = None,
+    ) -> AppFuture | None:
         """Get the parsl app future for the job.
 
         This effectively queues the job for execution by a worker, subject to
@@ -258,23 +266,22 @@ class ParslJob:
 
         Parameters
         ----------
-        app : callable
+        app : `parsl.app.bash.BashApp`
             A parsl bash_app decorator to use.
-        inputs : list of `Future`
+        inputs : `list` [ `parsl.dataflow.futures.AppFuture` ]
             Dependencies to be satisfied before executing this job.
         command_prefix : `str`, optional
             Bash commands to execute before the job command, e.g., for setting
             the environment.
-        add_resources : `bool`
-            Add resource specification when submitting the job? This is only
-            appropriate for the ``WorkQueue`` executor; other executors will
-            raise an exception.
+        resource_list : `list`, optional
+            List of resource specifications to pass to the Parsl executor.
 
         Returns
         -------
-        future : `Future` or `None`
-            A `Future` object linked to the execution of the job, or `None` if
-            the job has already been done (e.g., by ``run_local``).
+        future : `parsl.dataflow.futures.AppFuture` or `None`
+            A `parsl.dataflow.futures.AppFuture` object linked to the execution
+            of the job, or `None` if the job has already been done (e.g., by
+            ``run_local``).
         """
         if self.done:
             return None  # Nothing to do
@@ -283,7 +290,11 @@ class ParslJob:
             command = self.evaluate_command_line(command)
             if command_prefix:
                 command = command_prefix + "\n" + command
-            resources = self.get_resources() if add_resources else {}
+            resources = (
+                {k: v for k, v in self.get_resources().items() if k in resource_list}
+                if resource_list is not None
+                else {}
+            )
 
             # Add a layer of indirection to which we can add a useful name.
             # This name is used by parsl for tracking workflow status.

lsst/ctrl/bps/parsl/site.py

@@ -54,18 +54,16 @@ class SiteConfig(ABC):
 
     Parameters
     ----------
-    config : `BpsConfig`
+    config : `lsst.ctrl.bps.BpsConfig`
         BPS configuration.
-    add_resources : `bool`
-        Add resource specification when submitting the job? This is only
-        appropriate for the ``WorkQueue`` executor; other executors will
-        raise an exception.
+    resource_list : `list`, optional
+        List of parsl resource specifications to pass to the executor.
     """
 
-    def __init__(self, config: BpsConfig, add_resources: bool = False):
+    def __init__(self, config: BpsConfig, resource_list: list = None):
         self.config = config
         self.site = self.get_site_subconfig(config)
-        self.add_resources = add_resources
+        self.resource_list = resource_list
 
     @staticmethod
     def get_site_subconfig(config: BpsConfig) -> BpsConfig:
@@ -76,12 +74,12 @@ class SiteConfig(ABC):
 
         Parameters
         ----------
-        config : `BpsConfig`
+        config : `lsst.ctrl.bps.BpsConfig`
             BPS configuration.
 
         Returns
         -------
-        site : `BpsConfig`
+        site : `lsst.ctrl.bps.BpsConfig`
             Site sub-configuration.
         """
         computeSite = get_bps_config_value(config, "computeSite", str, required=True)
@@ -99,7 +97,7 @@ class SiteConfig(ABC):
 
         Parameters
         ----------
-        config : `BpsConfig`
+        config : `lsst.ctrl.bps.BpsConfig`
             BPS configuration.
 
         Returns
@@ -128,7 +126,7 @@ class SiteConfig(ABC):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns
@@ -187,7 +185,7 @@ class SiteConfig(ABC):
 
         Returns
         -------
-        monitor : `MonitoringHub` or `None`
+        monitor : `parsl.monitoring.MonitoringHub` or `None`
             Parsl monitor, or `None` for no monitor.
         """
         if not get_bps_config_value(self.site, "monitorEnable", bool, False):

lsst/ctrl/bps/parsl/sites/__init__.py

@@ -29,3 +29,4 @@ from .local import *
 from .slurm import *
 from .torque import *
 from .work_queue import *
+from .ccin2p3 import *

lsst/ctrl/bps/parsl/sites/ccin2p3.py

@@ -11,7 +11,7 @@ from ..configuration import get_bps_config_value
 from ..site import SiteConfig
 
 if TYPE_CHECKING:
-    from .job import ParslJob
+    from ..job import ParslJob
 
 __all__ = ("Ccin2p3",)
 
@@ -46,7 +46,7 @@ class Ccin2p3(SiteConfig):
     If you do need to modify those defaults, you can overwrite them for
     all job slots or for specific each job slots. Requirements specified
     for a job slot take priority over those specified for all job slots
-    at the level of entry '.site.ccin2p3:'.
+    at the level of entry ``.site.ccin2p3:``.
 
     This is an example of how to overwrite selected requirements in your BPS
     submission file:
@@ -79,40 +79,41 @@ class Ccin2p3(SiteConfig):
                 - "--licenses=my_product"
                 - "--reservation=my_reservation"
 
-    At the level of entry 'site.ccin2p3:' in the BPS submission file, the
+    At the level of entry ``site.ccin2p3:`` in the BPS submission file, the
     following configuration parameters are accepted, which apply to all slot
     sizes:
 
-    - `partition` (`str`): name of the one or more configured partitions. If
+    - ``partition`` (`str`): name of the one or more configured partitions. If
        more than one, separate them with comma (',').
        (Default: "lsst,htc")
-    - `walltime` (`str`): walltime to require for the job (Default: "72:00:00")
-    - `scheduler_options` (`list` [`str`] ): scheduler options to send to Slurm
-       for scheduling purposes.
+    - ``walltime`` (`str`): walltime to require for the job
+       (Default: "72:00:00")
+    - ``scheduler_options`` (`list` [`str`] ): scheduler options to send to
+       Slurm for scheduling purposes.
        (Default: "--licenses=sps")
 
     In addition, as shown in the previous example, for each job slot (i.e.
     "small", "medium", etc.) you can specify the requirements above as well as
     the following:
 
-    - `max_blocks` (`int`): maximum number of Slurm jobs that your workflow can
-       simultaneously use.
-    - `memory` (`int`): required amount of memory for each job, in Gigabytes.
-       (Defaults: 4 for "small", 10 for "medium", 50 fo "large" and
+    - ``max_blocks`` (`int`): maximum number of Slurm jobs that your workflow
+       can simultaneously use.
+    - ``memory`` (`int`): required amount of memory for each job, in Gigabytes.
+       (Defaults: 4 for "small", 10 for "medium", 50 for "large" and
        150 for "xlarge").
 
     Parameters
     ----------
-    *args : optional
+    *args
         Arguments to initialize the super-class.
-    **kwargs : optional
+    **kwargs
         Keyword arguments to initialize the super-class.
 
     Returns
     -------
-    Ccin2p3 : `SiteConfig`
-        Concrete instance of a `SiteConfig` specific for the CC-IN2P3 Slurm
-        farm.
+    Ccin2p3 : `lsst.ctrl.bps.parsl.SiteConfig`
+        Concrete instance of a `~lsst.ctrl.bps.parsl.SiteConfig` specific for
+        the CC-IN2P3 Slurm farm.
     """
 
     DEFAULT_ACCOUNT: str = "lsst"
@@ -122,6 +123,8 @@ class Ccin2p3(SiteConfig):
     ]
 
     def __init__(self, *args, **kwargs):
+        # Have BPS-defined resource requests for each job passed to executor.
+        kwargs["resource_list"] = ["priority"]
         super().__init__(*args, **kwargs)
         self._account = get_bps_config_value(self.site, ".account", str, self.DEFAULT_ACCOUNT)
         self._scheduler_options = get_bps_config_value(
@@ -314,7 +317,7 @@ class Ccin2p3(SiteConfig):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns

lsst/ctrl/bps/parsl/sites/local.py

@@ -43,10 +43,25 @@ __all__ = ("Local",)
 class Local(SiteConfig):
     """Configuration for running jobs on the local machine.
 
+    Parameters
+    ----------
+    *args : `~typing.Any`
+        Parameters forwarded to base class constructor.
+    **kwargs : `~typing.Any`
+        Keyword arguments passed to base class constructor, augmented by
+        the ``resource_list`` argument.
+
+    Notes
+    -----
     The number of cores to use is specified in the site configuration, under
     ``site.<computeSite>.cores`` (`int`).
     """
 
+    def __init__(self, *args, **kwargs):
+        # Have BPS-defined resource requests for each job passed to executor.
+        kwargs["resource_list"] = ["priority"]
+        super().__init__(*args, **kwargs)
+
     def get_executors(self) -> list[ParslExecutor]:
         """Get a list of executors to be used in processing.
 
@@ -60,7 +75,7 @@ class Local(SiteConfig):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns

lsst/ctrl/bps/parsl/sites/princeton.py

@@ -104,7 +104,7 @@ class Tiger(Slurm):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns

lsst/ctrl/bps/parsl/sites/slac.py

@@ -92,7 +92,7 @@ class Sdf(Slurm):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns

lsst/ctrl/bps/parsl/sites/slurm.py

@@ -46,6 +46,16 @@ Kwargs = dict[str, Any]
 class Slurm(SiteConfig):
     """Configuration for generic Slurm cluster.
 
+    Parameters
+    ----------
+    *args : `~typing.Any`
+        Parameters forwarded to base class constructor.
+    **kwargs : `~typing.Any`
+        Keyword arguments passed to base class constructor, augmented by
+        the ``resource_list`` argument.
+
+    Notes
+    -----
     This can be used directly as the site configuration for a Slurm cluster by
     setting the BPS config, e.g.:
 
@@ -80,6 +90,11 @@ class Slurm(SiteConfig):
       script (each line usually starting with ``#SBATCH``).
     """
 
+    def __init__(self, *args, **kwargs):
+        # Have BPS-defined resource requests for each job passed to executor.
+        kwargs["resource_list"] = ["priority"]
+        super().__init__(*args, **kwargs)
+
     def make_executor(
         self,
         label: str,
@@ -121,13 +136,15 @@ class Slurm(SiteConfig):
         scheduler_options : `str`, optional
             ``#SBATCH`` directives to prepend to the Slurm submission script.
         provider_options : `dict`, optional
-            Additional arguments for `SlurmProvider` constructor.
+            Additional arguments for `parsl.providers.SlurmProvider`
+            constructor.
         executor_options : `dict`, optional
-            Additional arguments for `HighThroughputExecutor` constructor.
+            Additional arguments for `parsl.executors.HighThroughputExecutor`
+            constructor.
 
         Returns
         -------
-        executor : `HighThroughputExecutor`
+        executor : `parsl.executors.HighThroughputExecutor`
             Executor for Slurm jobs.
         """
         nodes = get_bps_config_value(self.site, "nodes", int, nodes, required=True)
@@ -186,7 +203,7 @@ class Slurm(SiteConfig):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns
@@ -260,11 +277,11 @@ class TripleSlurm(Slurm):
 
         Parameters
         ----------
-        small_options : kwargs
+        small_options : `dict` [`str`, `typing.Any`]
             Options for ``make_executor`` for small executor.
-        medium_options : kwargs
+        medium_options : `dict` [`str`, `typing.Any`]
             Options for ``make_executor`` for medium executor.
-        large_options : kwargs
+        large_options : `dict` [`str`, `typing.Any`]
             Options for ``make_executor`` for large executor.
         **common_options
             Common options for ``make_executor`` for each of the executors.
@@ -297,7 +314,7 @@ class TripleSlurm(Slurm):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns

lsst/ctrl/bps/parsl/sites/torque.py

@@ -47,6 +47,16 @@ Kwargs = dict[str, Any]
 class Torque(SiteConfig):
     """Configuration for generic Torque cluster.
 
+    Parameters
+    ----------
+    *args : `~typing.Any`
+        Parameters forwarded to base class constructor.
+    **kwargs : `~typing.Any`
+        Keyword arguments passed to base class constructor, augmented by
+        the ``resource_list`` argument.
+
+    Notes
+    -----
     This can be used directly as the site configuration for a Torque cluster by
     setting the BPS config, e.g.:
 
@@ -75,6 +85,11 @@ class Torque(SiteConfig):
       script (each line usually starting with ``#PBS``).
     """
 
+    def __init__(self, *args, **kwargs):
+        # Have BPS-defined resource requests for each job passed to executor.
+        kwargs["resource_list"] = ["priority"]
+        super().__init__(*args, **kwargs)
+
     def make_executor(
         self,
         label: str,
@@ -105,18 +120,20 @@ class Torque(SiteConfig):
             Default time limit for each Torque job.
         mem_per_worker : `float`, optional
             Minimum memory per worker (GB), limited by the executor.
-        worker_init : `str`, optional
-            Environment initiation command
         scheduler_options : `str`, optional
             ``#SBATCH`` directives to prepend to the Torque submission script.
+        worker_init : `str`, optional
+            Environment initiation command.
         provider_options : `dict`, optional
-            Additional arguments for `TorqueProvider` constructor.
+            Additional arguments for `parsl.providers.TorqueProvider`
+            constructor.
         executor_options : `dict`, optional
-            Additional arguments for `HighThroughputExecutor` constructor.
+            Additional arguments for `parsl.executors.HighThroughputExecutor`
+            constructor.
 
         Returns
         -------
-        executor : `HighThroughputExecutor`
+        executor : `parsl.executors.HighThroughputExecutor`
             Executor for Torque jobs.
         """
         nodes = get_bps_config_value(self.site, "nodes", int, nodes, required=True)
@@ -174,7 +191,7 @@ class Torque(SiteConfig):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns
@@ -186,8 +203,20 @@ class Torque(SiteConfig):
 
 
 class PbsTorqueProvider(TorqueProvider):
-    """Torque Execution Provider
-
+    """Torque Execution Provider.
+
+    Parameters
+    ----------
+    *args : `~typing.Any`
+        Parameters forwarded to base class constructor.
+    tasks_per_node : `int`, optional
+        Number of tasks per node.
+    **kwargs : `~typing.Any`
+        Keyword arguments passed to base class constructor, augmented by
+        the ``resource_list`` argument.
+
+    Notes
+    -----
     This provider uses qsub to submit, qstat for status, and qdel to cancel
     jobs. The qsub script to be used is created from a template file in this
     same module.
@@ -203,12 +232,6 @@ class PbsTorqueProvider(TorqueProvider):
     def submit(self, command, tasks_per_node, job_name="parsl.torque"):
         """Submit the command onto an Local Resource Manager job.
 
-        This function returns an ID that corresponds to the task that was just
-        submitted.
-
-        The ``tasks_per_node`` parameter is ignored in this provider, as it is
-        set at construction time.
-
         Parameters
         ----------
         command : `str`
@@ -221,9 +244,17 @@ class PbsTorqueProvider(TorqueProvider):
 
         Returns
         -------
-            None: At capacity, cannot provision more
-            job_id (string): Identifier for the job
+        response : `str` or `None`
+            If `None`: At capacity, cannot provision more.
+            If job_id (`str`): Identifier for the job.
+
+        Notes
+        -----
+        This function returns an ID that corresponds to the task that was just
+        submitted.
 
+        The ``tasks_per_node`` parameter is ignored in this provider, as it is
+        set at construction time.
         """
         return super().submit(
             command=command,
@@ -236,10 +267,22 @@ class PbsMpiRunLauncher(MpiRunLauncher):
     """Worker launcher that wraps the user's command with the framework to
     launch multiple command invocations via ``mpirun``.
 
+    Parameters
+    ----------
+    debug : `bool`, optional
+        Enable or disable debug logging.
+    bash_location : `str`, optional
+        Path to the ``bash`` shell binary.
+    overrides : `str`, optional
+        Any override options.
+
+    Notes
+    -----
     This wrapper sets the bash env variable ``CORES`` to the number of cores on
     the machine.
 
     This launcher makes the following assumptions:
+
     - mpirun is installed and can be located in ``$PATH``
     - The provider makes available the ``$PBS_NODEFILE`` environment variable
     """

lsst/ctrl/bps/parsl/sites/work_queue.py

@@ -47,11 +47,11 @@ __all__ = ("LocalSrunWorkQueue", "WorkQueue")
 
 
 class WorkQueue(SiteConfig):
-    """Base class configuraton for `WorkQueueExecutor`.
+    """Base class configuraton for `parsl.executors.WorkQueueExecutor`.
 
     Subclasses must provide implementations for ``.get_executors``
     and ``.select_executor``.  In ``.get_executors``, the site-specific
-    `ExecutionProvider` must be defined.
+    `~parsl.providers.base.ExecutionProvider` must be defined.
 
     Parameters
     ----------
@@ -59,7 +59,7 @@ class WorkQueue(SiteConfig):
         Parameters forwarded to base class constructor.
     **kwargs : `~typing.Any`
         Keyword arguments passed to base class constructor, augmented by
-        the ``add_resources`` argument.
+        the ``resource_list`` argument.
 
     Notes
     -----
@@ -79,7 +79,7 @@ class WorkQueue(SiteConfig):
 
     def __init__(self, *args, **kwargs):
         # Have BPS-defined resource requests for each job passed to work_queue.
-        kwargs["add_resources"] = True
+        kwargs["resource_list"] = ["memory", "cores", "disk", "running_time_min", "priority"]
         super().__init__(*args, **kwargs)
 
     def make_executor(
@@ -91,20 +91,20 @@ class WorkQueue(SiteConfig):
         worker_options: str = "",
         wq_max_retries: int = 1,
     ) -> ParslExecutor:
-        """Return a `WorkQueueExecutor`.  The ``provider`` contains the
-        site-specific configuration.
+        """Return a `parsl.executors.WorkQueueExecutor`.  The ``provider``
+        contains the site-specific configuration.
 
         Parameters
         ----------
         label : `str`
             Label for executor.
-        provider : `ExecutionProvider`
-            Parsl execution provider, e.g., `SlurmProvider`.
+        provider : `parsl.providers.base.ExecutionProvider`
+            Parsl execution provider, e.g., `parsl.providers.SlurmProvider`.
         port : `int`, optional
             Port used by work_queue.  Default: ``9000``.
         worker_options : `str`, optional
             Extra options to pass to work_queue workers, e.g.,
-            ``"--memory=90000"``. Default: `""`.
+            ``"--memory=90000"``. Default: ``""``.
         wq_max_retries : `int`, optional
             Number of retries for work_queue to attempt per job.  Set to
             ``None`` to have it try indefinitely; set to ``1`` to have Parsl
@@ -125,13 +125,13 @@ class WorkQueue(SiteConfig):
 
 
 class LocalSrunWorkQueue(WorkQueue):
-    """Configuration for a `WorkQueueExecutor` that uses a `LocalProvider`
-    to manage resources.
+    """Configuration for a `parsl.executors.WorkQueueExecutor` that uses a
+    `parsl.providers.LocalProvider` to manage resources.
 
     This can be used directly as the site configuration within a
     multi-node allocation when Slurm is available.  For running on a
-    single node, e.g., a laptop, a `SingleNodeLauncher` is used, and
-    Slurm need not be available.
+    single node, e.g., a laptop, a `parsl.launchers.SingleNodeLauncher` is
+    used, and Slurm need not be available.
 
     The following BPS configuration parameters are recognized, overriding the
     defaults:
@@ -170,7 +170,7 @@ class LocalSrunWorkQueue(WorkQueue):
 
         Parameters
         ----------
-        job : `ParslJob`
+        job : `lsst.ctrl.bps.parsl.ParslJob`
             Job to be executed.
 
         Returns

lsst/ctrl/bps/parsl/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "30.0.0rc2"
+__version__ = "30.0.1rc1"

lsst/ctrl/bps/parsl/workflow.py

@@ -60,7 +60,7 @@ def get_parsl_config(config: BpsConfig) -> parsl.config.Config:
 
     Parameters
     ----------
-    config : `BpsConfig`
+    config : `lsst.ctrl.bps.BpsConfig`
         BPS configuration.
 
     Returns
@@ -83,7 +83,7 @@ class ParslWorkflow(BaseWmsWorkflow):
         Generic workflow config.
     path : `str`
         Path prefix for workflow output files.
-    jobs : `dict` mapping `str` to `ParslJob`
+    jobs : `dict` mapping `str` to `lsst.ctrl.bps.parsl.ParslJob`
         Jobs to be executed.
     parents : `dict` mapping `str` to iterable of `str`
         Dependency tree. Keywords are job names, and values are a list of job
@@ -92,7 +92,7 @@ class ParslWorkflow(BaseWmsWorkflow):
     endpoints : iterable of `str`
         Endpoints of the dependency tree. These jobs (specified by name) have
         no children.
-    final : `ParslJob`, optional
+    final : `lsst.ctrl.bps.parsl.ParslJob`, optional
         Final job to be done, e.g., to merge the execution butler. This is done
         locally.
     """
@@ -149,7 +149,7 @@ class ParslWorkflow(BaseWmsWorkflow):
 
         Parameters
         ----------
-        config : `BpsConfig`
+        config : `lsst.ctrl.bps.BpsConfig`
             Configuration of the workflow.
         generic_workflow : `lsst.ctrl.bps.generic_workflow.GenericWorkflow`
             Generic representation of a single workflow.
@@ -233,8 +233,9 @@ class ParslWorkflow(BaseWmsWorkflow):
 
         Returns
         -------
-        futures : `list` of `Future`
-            `Future` objects linked to the execution of the endpoint jobs.
+        futures : `list` of `parsl.dataflow.futures.AppFuture`
+            `parsl.dataflow.futures.AppFuture` objects linked to the execution
+            of the endpoint jobs.
         """
         futures = [self.execute(name) for name in self.endpoints]
         if block:
@@ -260,9 +261,9 @@ class ParslWorkflow(BaseWmsWorkflow):
 
         Returns
         -------
-        future : `Future` or `None`
-            A `Future` object linked to the execution of the job, or `None` if
-            the job is being reserved to run locally.
+        future : `parsl.dataflow.futures.AppFuture` or `None`
+            A `parsl.dataflow.futures.AppFuture` object linked to the execution
+            of the job, or `None` if the job is being reserved to run locally.
         """
         if name in ("pipetaskInit", "mergeExecutionButler"):
             # These get done outside of parsl
@@ -278,7 +279,7 @@ class ParslWorkflow(BaseWmsWorkflow):
             self.apps[label],
             [ff for ff in inputs if ff is not None],
             self.command_prefix,
-            self.site.add_resources,
+            self.site.resource_list,
         )
 
     def load_dfk(self):

{lsst_ctrl_bps_parsl-30.0.0rc2.dist-info → lsst_ctrl_bps_parsl-30.0.1rc1.dist-info}/METADATA

@@ -1,20 +1,20 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-parsl
-Version: 30.0.0rc2
+Version: 30.0.1rc1
 Summary: Parsl-based plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/ctrl_bps_parsl
+Project-URL: Source, https://github.com/lsst/ctrl_bps_parsl
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
-Requires-Python: >=3.11.0
+Requires-Python: >=3.12.0
 Description-Content-Type: text/markdown
 License-File: COPYRIGHT
 License-File: LICENSE

lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/RECORD

@@ -0,0 +1,26 @@
+lsst/ctrl/bps/parsl/__init__.py,sha256=gU6EMvA--BVorVVMw_4i9-F_kran4V-25WzAeLJRsqE,1466
+lsst/ctrl/bps/parsl/configuration.py,sha256=y5wfo9oiV9617x2iI_KByAJJ6NPSZ3M08kz69NxNz1c,5811
+lsst/ctrl/bps/parsl/environment.py,sha256=xg2_WM-H77KOdn0M_Wi2sE7h7aqTSV1uxSiFHJmnu5w,2250
+lsst/ctrl/bps/parsl/job.py,sha256=3mRDTg6XMoN71VmNzhna-1MSd75ifHQkF3jhljeLhrY,12462
+lsst/ctrl/bps/parsl/service.py,sha256=mKM6C4mVTr3n0PsZWf5w0zc_o6qBiroQA1YfEgmde5s,3951
+lsst/ctrl/bps/parsl/site.py,sha256=vgMGqAexb23ahdFb0D6vMtOvyjGArZTD-ze0cqtCeQY,8707
+lsst/ctrl/bps/parsl/version.py,sha256=-auEgPcWk4qAWrWVMJY7Of7dAJ0dNQHoqQraCNdAEN4,52
+lsst/ctrl/bps/parsl/workflow.py,sha256=eATSY0abV2iFePZOiOHnTY5vIuOl_5xeXfboXwETDHw,11619
+lsst/ctrl/bps/parsl/sites/__init__.py,sha256=J9HpVUqqlIkve0tIEELPbicY81vz_liZKpBUrTA1D2Q,1464
+lsst/ctrl/bps/parsl/sites/ccin2p3.py,sha256=7pKn9s6RCqUtNovJG3u-qwTGgxJq0whAk4k6eGUTJVg,14784
+lsst/ctrl/bps/parsl/sites/local.py,sha256=tN-mawQkMLbxeQULSWD159K9b8UFZyzu11Lb9An0Bqg,3126
+lsst/ctrl/bps/parsl/sites/nersc.py,sha256=obUiaHgHZj_23PIrYdihUnb8eoEJMs288wHy84jIzaQ,4549
+lsst/ctrl/bps/parsl/sites/princeton.py,sha256=U12w0GZBXj-ZmkG5qnFawmQ8dH-A2kw2lWZ7DYPodXc,5595
+lsst/ctrl/bps/parsl/sites/slac.py,sha256=SrzNjG1c_xtPDwZBSW0P9hIpvkBktGAggVj4fdzWSIM,3913
+lsst/ctrl/bps/parsl/sites/slurm.py,sha256=qyx2pbYtmBsyEnSwNPyw8zpZdUAwJ-jB3aYMoc4mHRE,13484
+lsst/ctrl/bps/parsl/sites/torque.py,sha256=qx8vxko1PR1I1GJNbNblIrARSl5b8JuXfr6IIPpsG-o,10879
+lsst/ctrl/bps/parsl/sites/work_queue.py,sha256=MPFSd6mfUdxWodQBZE8GQ9ivwTbtHkUvdiVrmyeRq6k,7256
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/licenses/COPYRIGHT,sha256=M5ylfMNsihIJcPySQ5ZFjec4zROSZdlNN9oGHBhu7WM,181
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/METADATA,sha256=5KlNmeWU3IWRPLAZreL5OH5BDMTbWJenuNgLdchPuYY,2960
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_bps_parsl-30.0.1rc1.dist-info/RECORD,,

{lsst_ctrl_bps_parsl-30.0.0rc2.dist-info → lsst_ctrl_bps_parsl-30.0.1rc1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/RECORD

@@ -1,26 +0,0 @@
-lsst/ctrl/bps/parsl/__init__.py,sha256=gU6EMvA--BVorVVMw_4i9-F_kran4V-25WzAeLJRsqE,1466
-lsst/ctrl/bps/parsl/configuration.py,sha256=Dq9hZW0fnmNHZoD_eAH3u2Dk0sNCZQ9NuSnFjTzFEi4,5731
-lsst/ctrl/bps/parsl/environment.py,sha256=xg2_WM-H77KOdn0M_Wi2sE7h7aqTSV1uxSiFHJmnu5w,2250
-lsst/ctrl/bps/parsl/job.py,sha256=O95H0_f-S92xgjNQeDBCzDtQkiXKLK8uzFcx6cm-AVA,11728
-lsst/ctrl/bps/parsl/service.py,sha256=mKM6C4mVTr3n0PsZWf5w0zc_o6qBiroQA1YfEgmde5s,3951
-lsst/ctrl/bps/parsl/site.py,sha256=L_wAF7qwMkcIChD0KTrIokZOD8E47ck-Qixf8L95sPk,8708
-lsst/ctrl/bps/parsl/version.py,sha256=CrAQNQjb1NNXqaNvScI53U2GvkmrnpRtyOiy0bIrcl4,52
-lsst/ctrl/bps/parsl/workflow.py,sha256=s6ayWoZ1CX2_mdFJvksiwUNChy9pfloxZ6JU87bfuLA,11435
-lsst/ctrl/bps/parsl/sites/__init__.py,sha256=w_IOW3_lBguS5k3U9R925wCENgUhu3407FSw7ExrKus,1441
-lsst/ctrl/bps/parsl/sites/ccin2p3.py,sha256=UD86cgS9ffJaz__zs4PQmHQqE7B4jhMWAerViCAt7Gk,14597
-lsst/ctrl/bps/parsl/sites/local.py,sha256=El8U6XfeYBbfHyg-7R3a1gtWX1IBLq_xZvKXyjiAQIk,2622
-lsst/ctrl/bps/parsl/sites/nersc.py,sha256=obUiaHgHZj_23PIrYdihUnb8eoEJMs288wHy84jIzaQ,4549
-lsst/ctrl/bps/parsl/sites/princeton.py,sha256=F_dHTN5sm2NM2VjtJoWbtKfhkowBocIs5F7eSgjxc-0,5575
-lsst/ctrl/bps/parsl/sites/slac.py,sha256=IN04Nx0YvOl-GN33MB05zT0XG3IQ91rXri_EHz_dzTs,3893
-lsst/ctrl/bps/parsl/sites/slurm.py,sha256=6aA4cJSS1nSUydKZ1o-4xKDydgOoictWBl9mJPhB3vY,12822
-lsst/ctrl/bps/parsl/sites/torque.py,sha256=gP8X-u3oH6P79kw2Fj_Mx3NqpVSQmqSHMT1tgxiU7Yc,9621
-lsst/ctrl/bps/parsl/sites/work_queue.py,sha256=QpeGjd7o0FpnXRrbrxTNSXcfkTHclBKv6vMPPRRgfd8,7040
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/licenses/COPYRIGHT,sha256=M5ylfMNsihIJcPySQ5ZFjec4zROSZdlNN9oGHBhu7WM,181
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/METADATA,sha256=JFQVegSzXO950hXyKBPDX0zou-0HUfn0F6OS4ZRlQWI,2951
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_bps_parsl-30.0.0rc2.dist-info/RECORD,,