@@ -46,12 +46,14 @@ def suppress_stdout():
4646 sys .stdout .close ()
4747 sys .stdout = old_stdout
4848
49+
4950def module_dict_from_module_string (module ):
5051 module_name , module_version = module .split ("/" , 1 )
5152 module_dict = {"module_name" : module_name , "module_version" : module_version , "full_module_name" : module }
5253
5354 return module_dict
5455
56+
5557def load_and_list_modules (full_module_name ):
5658 """
5759 Run `module load <name>` and `module list` inside a subshell.
@@ -71,11 +73,7 @@ def load_and_list_modules(full_module_name):
7173 raise RuntimeError (f"Failed to load module '{ full_module_name } ':\n { result .stdout } " )
7274
7375 # Parse module list output
74- modules = [
75- module_dict_from_module_string (line )
76- for line in result .stdout .splitlines ()
77- if "/" in line
78- ]
76+ modules = [module_dict_from_module_string (line ) for line in result .stdout .splitlines () if "/" in line ]
7977
8078 # Filter out the modules we expect to be loaded
8179 eessi_extend_module_name = "EESSI-extend"
@@ -268,7 +266,9 @@ def collect_eb_files(base_path):
268266 continue
269267
270268 # Add important data that is related to the module environment
271- eessi_software ["eessi_version" ][eessi_version ][file ]["module" ] = module_dict_from_module_string (parsed_ec ["full_mod_name" ])
269+ eessi_software ["eessi_version" ][eessi_version ][file ]["module" ] = module_dict_from_module_string (
270+ parsed_ec ["full_mod_name" ]
271+ )
272272 # Retain the easyblocks used so we can use a heuristic to figure out the type of extensions (R, Python, Perl)
273273 eessi_software ["eessi_version" ][eessi_version ][file ]["easyblocks" ] = easyblocks_used
274274
0 commit comments