snakemake-executor-plugin-slurm 0.10.1__tar.gz → 0.11.0__tar.gz

{snakemake_executor_plugin_slurm-0.10.1 → snakemake_executor_plugin_slurm-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: snakemake-executor-plugin-slurm
-Version: 0.10.1
+Version: 0.11.0
 Summary: A Snakemake executor plugin for submitting jobs to a SLURM cluster.
 Home-page: https://github.com/snakemake/snakemake-executor-plugin-slurm
 License: MIT

{snakemake_executor_plugin_slurm-0.10.1 → snakemake_executor_plugin_slurm-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "snakemake-executor-plugin-slurm"
-version = "0.10.1"
+version = "0.11.0"
 description = "A Snakemake executor plugin for submitting jobs to a SLURM cluster."
 authors = [
     "Christian Meesters <meesters@uni-mainz.de>",

{snakemake_executor_plugin_slurm-0.10.1 → snakemake_executor_plugin_slurm-0.11.0}/snakemake_executor_plugin_slurm/__init__.py

@@ -42,6 +42,18 @@ class ExecutorSettings(ExecutorSettingsBase):
             "required": False,
         },
     )
+    requeue: bool = field(
+        default=False,
+        metadata={
+            "help": """
+                    Allow requeuing preempted of failed jobs,
+                    if no cluster default. Results in `sbatch ... --requeue ...`
+                    This flag has no effect, if not set.
+                    """,
+            "env_var": False,
+            "required": False,
+        },
+    )
 
 
 # Required:
@@ -79,8 +91,6 @@ class Executor(RemoteExecutor):
         self._fallback_account_arg = None
         self._fallback_partition = None
         self._preemption_warning = False  # no preemption warning has been issued
-        # providing a short-hand, even if subsequent calls seem redundant
-        self.settings: ExecutorSettings = self.workflow.executor_settings
 
     def warn_on_jobcontext(self, done=None):
         if not done:
@@ -145,6 +155,9 @@ class Executor(RemoteExecutor):
         call += self.get_account_arg(job)
         call += self.get_partition_arg(job)
 
+        if self.workflow.executor_settings.requeue:
+            call += " --requeue"
+
         if job.resources.get("clusters"):
             call += f" --clusters {job.resources.clusters}"
 
@@ -361,6 +374,7 @@ needs to restart this job upon a Snakemake restart.
 
 We leave it to SLURM to resume your job(s)"""
                     )
+                    yield j
                 elif status == "UNKNOWN":
                     # the job probably does not exist anymore, but 'sacct' did not work
                     # so we assume it is finished