Merge remote-tracking branch 'refs/remotes/origin/main' into release_…

…openmpi_constraint # Conflicts: # pympipool/scheduler/__init__.py # pympipool/shared/inputcheck.py # tests/test_shared_input_check.py
pyiron · May 29, 2024 · 4af4e97 · 4af4e97
2 parents ed541e0 + 75613c1
commit 4af4e97
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pympipool/scheduler/__init__.py b/pympipool/scheduler/__init__.py
@@ -12,9 +12,9 @@
     check_threads_per_core,
     check_oversubscribe,
     check_executor,
-    validate_backend,
     check_init_function,
     check_pmi,
+    validate_backend,
     validate_number_of_cores,
 )
 from pympipool.scheduler.slurm import (

diff --git a/pympipool/shared/inputcheck.py b/pympipool/shared/inputcheck.py
@@ -69,7 +69,7 @@ def check_refresh_rate(refresh_rate: float):
 
 def validate_backend(
     backend: str, flux_installed: bool = False, slurm_installed: bool = False
-):
+) -> str:
     if backend not in ["auto", "mpi", "slurm", "flux"]:
         raise ValueError(
             'The currently implemented backends are ["flux", "mpi", "slurm"]. '

diff --git a/tests/test_shared_input_check.py b/tests/test_shared_input_check.py
@@ -6,11 +6,11 @@
     check_threads_per_core,
     check_oversubscribe,
     check_executor,
-    validate_backend,
     check_init_function,
     check_refresh_rate,
     check_resource_dict,
     check_resource_dict_is_empty,
+    validate_backend,
 )