Skip to content

Commit 7084f91

Browse files
committed
Fix minor style issues
1 parent 5ed588f commit 7084f91

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

easybuild/framework/easyblock.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,11 @@ def collect_exts_file_info(self, fetch_files=True, verify_checksums=True):
670670
'name': ext_name,
671671
'version': ext_version,
672672
'options': ext_options,
673+
# if a particular easyblock is specified, make sure it's used
674+
# (this is picked up by init_ext_instances)
675+
'easyblock': ext_options.get('easyblock', None),
673676
}
674677

675-
# if a particular easyblock is specified, make sure it's used
676-
# (this is picked up by init_ext_instances)
677-
ext_src['easyblock'] = ext_options.get('easyblock', None)
678-
679678
# construct dictionary with template values;
680679
# inherited from parent, except for name/version templates which are specific to this extension
681680
template_values = copy.deepcopy(self.cfg.template_values)
@@ -1810,7 +1809,7 @@ def inject_module_extra_paths(self):
18101809
msg += f"and paths='{env_var}'"
18111810
self.log.debug(msg)
18121811

1813-
def expand_module_search_path(self, search_path, path_type=ModEnvVarType.PATH_WITH_FILES):
1812+
def expand_module_search_path(self, *args, **kwargs):
18141813
"""
18151814
REMOVED in EasyBuild 5.1, use EasyBlock.module_load_environment.expand_paths instead
18161815
"""
@@ -2773,7 +2772,7 @@ def check_checksums_for(self, ent, sub='', source_cnt=None):
27732772
# if the filename is a dict, the actual source file name is the "filename" element
27742773
if isinstance(fn, dict):
27752774
fn = fn["filename"]
2776-
if fn in checksums_from_json.keys():
2775+
if fn in checksums_from_json:
27772776
checksums += [checksums_from_json[fn]]
27782777

27792778
if source_cnt is None:

0 commit comments

Comments
 (0)