From 92a5007a7e1e6e7541e0b9d0abdea2f3fdd9001f Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Sun, 10 Nov 2024 16:54:04 +0100 Subject: [PATCH] fix type check in generic Bundle easyblock --- easybuild/easyblocks/generic/bundle.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/easybuild/easyblocks/generic/bundle.py b/easybuild/easyblocks/generic/bundle.py index 7225e06085..04aad3eab8 100644 --- a/easybuild/easyblocks/generic/bundle.py +++ b/easybuild/easyblocks/generic/bundle.py @@ -324,15 +324,14 @@ def install_step(self): def make_module_req_guess(self): """ - Set module requirements from all comppnents, e.g. $PATH, etc. + Set module requirements from all components, e.g. $PATH, etc. During the install step, we only set these requirements temporarily. Later on when building the module, those paths are not considered. Therefore, iterate through all the components again and gather the requirements. Do not remove duplicates or check for existance of folders, - as this is done in the generic EasyBlock while creating - the modulefile already. + as this is done while creating the modulefile already. """ # Start with the paths from the generic EasyBlock. # If not added here, they might be missing entirely and fail sanity checks. @@ -344,7 +343,7 @@ def make_module_req_guess(self): try: for key, value in sorted(reqs.items()): - if isinstance(reqs, string_type): + if isinstance(reqs, str): value = [value] final_reqs.setdefault(key, []) final_reqs[key] += value