Skip to content

transfer dependencies in Bundle easyblock and fix sanity check for module only #4037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 4 commits into from
Jan 21, 2026
+21 −9
Merged

transfer dependencies in Bundle easyblock and fix sanity check for module only #4037

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a46a4a8
transfer dependencies in Bundle easyblock and fix sanity check for mo…
Thyre Jan 6, 2026
3742f0f
fix style in Bundle easyblock
Thyre Jan 6, 2026
b0b62fc
fix missing kwargs for patch_step in Bundle easyblock
Thyre Jan 6, 2026
5010c6f
set builddirs and sanity check even earlier in bundle easyblock
Thyre Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions easybuild/easyblocks/generic/bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,18 @@ def __init__(self, *args, **kwargs):
# Patch step is skipped so adding postinstall patches of components here is harmless
self.cfg.update('patches', comp_postinstall_patches)

self.comp_instances.append((comp_cfg, comp_cfg.easyblock(comp_cfg, logfile=self.logfile)))
# instantiate the component to transfer further information
comp_instance = comp_cfg.easyblock(comp_cfg, logfile=self.logfile)

# correct build/install dirs
comp_instance.builddir = self.builddir
comp_instance.install_subdir, comp_instance.installdir = self.install_subdir, self.installdir

# check if sanity checks are enabled for the component
if self.cfg['sanity_check_all_components'] or comp_cfg['name'] in self.cfg['sanity_check_components']:
self.comp_cfgs_sanity_check.append(comp_instance)
# lastly, add it to the list of components we'll deal with later
self.comp_instances.append((comp_cfg, comp_instance))

self.cfg.update('checksums', checksums_patches + orig_checksums)

Expand All @@ -263,6 +274,15 @@ def check_checksums(self):

return checksum_issues

def prepare_step(self, *args, **kwargs):
"""
Pre-configure step.
At this point, dependencies are known. So transfer them to all components.
"""
super().prepare_step(self, *args, **kwargs)
for _, comp in self.comp_instances:
comp.toolchain.dependencies = self.toolchain.dependencies

def patch_step(self):
"""Patch step must be a no-op for bundle, since there are no top-level sources/patches."""
pass
Expand Down Expand Up @@ -319,10 +339,6 @@ def install_step(self):
(comp.name, comp.version, idx + 1, comp_cnt))
self.log.info("Installing component %s v%s using easyblock %s", comp.name, comp.version, cfg.easyblock)

# correct build/install dirs
comp.builddir = self.builddir
comp.install_subdir, comp.installdir = self.install_subdir, self.installdir

# make sure we can build in parallel
comp.set_parallel()

Expand Down Expand Up @@ -361,10 +377,6 @@ def install_step(self):
# location of first unpacked source is used to determine where to apply patch(es)
comp.src[-1]['finalpath'] = comp.cfg['start_dir']

# check if sanity checks are enabled for the component
if self.cfg['sanity_check_all_components'] or comp.name in self.cfg['sanity_check_components']:
self.comp_cfgs_sanity_check.append(comp)

self._install_component(comp)

if comp.make_module_req_guess.__qualname__ != 'EasyBlock.make_module_req_guess':
Expand Down