snakemake-executor-plugin-slurm 1.0.0__tar.gz → 1.0.1__tar.gz

{snakemake_executor_plugin_slurm-1.0.0 → snakemake_executor_plugin_slurm-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snakemake-executor-plugin-slurm
-Version: 1.0.0
+Version: 1.0.1
 Summary: A Snakemake executor plugin for submitting jobs to a SLURM cluster.
 License: MIT
 Keywords: snakemake,plugin,executor,cluster,slurm

{snakemake_executor_plugin_slurm-1.0.0 → snakemake_executor_plugin_slurm-1.0.1}/pyproject.toml

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

{snakemake_executor_plugin_slurm-1.0.0 → snakemake_executor_plugin_slurm-1.0.1}/snakemake_executor_plugin_slurm/__init__.py

@@ -85,6 +85,15 @@ class ExecutorSettings(ExecutorSettingsBase):
             "required": False,
         },
     )
+    no_account: bool = field(
+        default=False,
+        metadata={
+            "help": "Do not use any account for submission. "
+            "This flag has no effect, if not set.",
+            "env_var": False,
+            "required": False,
+        },
+    )
 
 
 # Required:
@@ -213,7 +222,9 @@ class Executor(RemoteExecutor):
             f"--comment '{comment_str}'"
         )
 
-        call += self.get_account_arg(job)
+        if not self.workflow.executor_settings.no_account:
+            call += self.get_account_arg(job)
+
         call += self.get_partition_arg(job)
 
         if self.workflow.executor_settings.requeue:
@@ -634,35 +645,45 @@ We leave it to SLURM to resume your job(s)"""
         """
         tests whether the given account is registered, raises an error, if not
         """
-        cmd = f'sacctmgr -n -s list user "{os.environ["USER"]}" format=account%256'
+        cmd = "sshare -U --format Account --noheader"
         try:
             accounts = subprocess.check_output(
                 cmd, shell=True, text=True, stderr=subprocess.PIPE
             )
         except subprocess.CalledProcessError as e:
-            sacctmgr_report = (
-                "Unable to test the validity of the given or guessed "
-                f"SLURM account '{account}' with sacctmgr: {e.stderr}."
+            sshare_report = (
+                "Unable to test the validity of the given or guessed"
+                f" SLURM account '{account}' with sshare: {e.stderr}."
             )
+            accounts = ""
+
+        if not accounts.strip():
+            cmd = f'sacctmgr -n -s list user "{os.environ["USER"]}" format=account%256'
             try:
-                cmd = "sshare -U --format Account --noheader"
                 accounts = subprocess.check_output(
                     cmd, shell=True, text=True, stderr=subprocess.PIPE
                 )
-            except subprocess.CalledProcessError as e2:
-                sshare_report = (
-                    "Unable to test the validity of the given or guessed"
-                    f" SLURM account '{account}' with sshare: {e2.stderr}."
+            except subprocess.CalledProcessError as e:
+                sacctmgr_report = (
+                    "Unable to test the validity of the given or guessed "
+                    f"SLURM account '{account}' with sacctmgr: {e.stderr}."
                 )
                 raise WorkflowError(
-                    f"The 'sacctmgr' reported: '{sacctmgr_report}' "
-                    f"and likewise 'sshare' reported: '{sshare_report}'."
+                    f"The 'sshare' reported: '{sshare_report}' "
+                    f"and likewise 'sacctmgr' reported: '{sacctmgr_report}'."
                 )
 
         # The set() has been introduced during review to eliminate
         # duplicates. They are not harmful, but disturbing to read.
         accounts = set(_.strip() for _ in accounts.split("\n") if _)
 
+        if not accounts:
+            self.logger.warning(
+                f"Both 'sshare' and 'sacctmgr' returned empty results for account "
+                f"'{account}'. Proceeding without account validation."
+            )
+            return ""
+
         if account not in accounts:
             raise WorkflowError(
                 f"The given account {account} appears to be invalid. Available "