fix: removed unused imports - got refactored

Author: cmeesters

snakemake_executor_plugin_slurm/__init__.py

@@ -302,18 +302,17 @@ class ExecutorSettings(ExecutorSettingsBase):
         default=None,
         metadata={
             "help": "Send signal to jobs before wall time (SLURM format). "
-                    "Format: --slurm-signal=RULE[:SCOPE]:SIGNAL@TIME. "
-                    "SCOPE: B (batch, default) or R (reservation). "
-                    "SIGNAL: name (SIGTERM) or number (15). TIME: seconds before wall time. "
-                    "Use RULE='all' for all rules. Examples: "
-                    "--slurm-signal=rule1:SIGTERM@30 --slurm-signal=rule2:R:SIGUSR1@60 "
-                    "--slurm-signal=all:15@45",
+            "Format: --slurm-signal=RULE[:SCOPE]:SIGNAL@TIME. "
+            "SCOPE: B (batch, default) or R (reservation). "
+            "SIGNAL: name (SIGTERM) or number (15). TIME: seconds before wall time. "
+            "Use RULE='all' for all rules. Examples: "
+            "--slurm-signal=rule1:SIGTERM@30 --slurm-signal=rule2:R:SIGUSR1@60 "
+            "--slurm-signal=all:15@45",
             "env_var": False,
             "required": False,
         },
     )
 
-
     qos: Optional[str] = field(
         default=None,
         metadata={

tests/test_jobsignalling.py

@@ -16,9 +16,10 @@
 @pytest.fixture
 def mock_job():
     """Create a mock job with configurable resources and metadata.
-    
+
     Returns a factory function that constructs mock jobs for testing.
     """
+
     def _create_job(name="signal_shell", **resources):
         mock_resources = MagicMock()
         mock_resources.get.side_effect = lambda key, default=None: resources.get(
@@ -71,21 +72,12 @@ def test_signal_is_ignored_for_other_rules(self):
     def test_multiple_signals_in_one_setting(self):
         """Multiple rules can have signals in a comma-separated list."""
         setting = "signal_shell:SIGUSR1@30,signal_python:R:SIGTERM@45"
-        assert (
-            get_slurm_signal_arg(setting, "signal_shell")
-            == " --signal=B:10@30"
-        )
-        assert (
-            get_slurm_signal_arg(setting, "signal_python")
-            == " --signal=R:15@45"
-        )
+        assert get_slurm_signal_arg(setting, "signal_shell") == " --signal=B:10@30"
+        assert get_slurm_signal_arg(setting, "signal_python") == " --signal=R:15@45"
 
     def test_all_keyword_applies_to_any_rule(self):
         """The 'all' keyword applies signal to any rule not explicitly configured."""
-        assert (
-            get_slurm_signal_arg("all:SIGUSR1@60", "any_rule")
-            == " --signal=B:10@60"
-        )
+        assert get_slurm_signal_arg("all:SIGUSR1@60", "any_rule") == " --signal=B:10@60"
         assert (
             get_slurm_signal_arg("all:R:SIGTERM@45", "other_rule")
             == " --signal=R:15@45"
@@ -95,15 +87,9 @@ def test_explicit_rule_takes_precedence_over_all(self):
         """An explicit rule setting overrides the 'all' setting."""
         setting = "all:SIGUSR1@60,signal_python:SIGTERM@30"
         # signal_python has explicit config
-        assert (
-            get_slurm_signal_arg(setting, "signal_python")
-            == " --signal=B:15@30"
-        )
+        assert get_slurm_signal_arg(setting, "signal_python") == " --signal=B:15@30"
         # other_rule falls back to 'all'
-        assert (
-            get_slurm_signal_arg(setting, "other_rule")
-            == " --signal=B:10@60"
-        )
+        assert get_slurm_signal_arg(setting, "other_rule") == " --signal=B:10@60"
 
 
 class TestSlurmSignalValidation:
@@ -125,8 +111,7 @@ def test_reservation_scope_allowed_with_reservation_setting(self):
         """Using R: scope with --slurm-reservation should not raise an error."""
         # Should not raise
         ExecutorSettings(
-            signal="signal_shell:R:SIGTERM@30",
-            reservation="my_reservation"
+            signal="signal_shell:R:SIGTERM@30", reservation="my_reservation"
         )
 
     def test_signal_cannot_be_overridden_via_slurm_extra(self, mock_job):

tests/testcases/slurm_signal/handle_signal.py

@@ -20,4 +20,4 @@ def handle_signal(signum, _frame):
     time.sleep(1)
 
 status = "python-finished-with-signal\n" if signal_received else "python-finished\n"
-output_path.write_text(status)
+output_path.write_text(status)

tests/tests.py

@@ -11,8 +11,8 @@
 from snakemake_interface_executor_plugins.settings import ExecutorSettingsBase
 from unittest.mock import MagicMock, patch
 import pytest
-from snakemake_executor_plugin_slurm import Executor, ExecutorSettings
-from snakemake_executor_plugin_slurm.utils import get_slurm_signal_arg, set_gres_string
+from snakemake_executor_plugin_slurm import ExecutorSettings
+from snakemake_executor_plugin_slurm.utils import set_gres_string
 from snakemake_executor_plugin_slurm.submit_string import get_submit_command
 from snakemake_executor_plugin_slurm.validation import (
     validate_slurm_extra,