Skip to content

retain condition to replace 'python' in exts_filter, only do so when needed #7

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
lexming merged 2 commits into from
Mar 26, 2026
Merged

retain condition to replace 'python' in exts_filter, only do so when needed #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
355932b
retain condition to replace 'python' in exts_filter, only do so when …
boegel Mar 25, 2026
5f7defc
minor improvement to logging for creating of dummy package + sanity c…
boegel Mar 25, 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
7 changes: 4 additions & 3 deletions easybuild/easyblocks/generic/pythonbundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ def prepare_python(self):

# if 'python' is not used, we need to take that into account in the extensions filter
# (which is also used during the sanity check)
with self.cfg.disable_templating():
orig_exts_filter = self.cfg['exts_filter']
self.cfg['exts_filter'] = (orig_exts_filter[0].replace('python', self.python_cmd), orig_exts_filter[1])
if self.python_cmd != 'python':
with self.cfg.disable_templating():
orig_exts_filter = self.cfg['exts_filter']
self.cfg['exts_filter'] = (orig_exts_filter[0].replace('python', self.python_cmd), orig_exts_filter[1])

def prepare_step(self, *args, **kwargs):
"""Prepare for installing bundle of Python packages."""
Expand Down
14 changes: 7 additions & 7 deletions easybuild/easyblocks/generic/pythonpackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,15 +852,15 @@ def install_dummy_package(self):
]

# make dist-info directory
dist_info_name = f"{self.name.replace('-','_')}-{self.version}.dist-info"
dist_info_name = self.name.replace('-', '_') + f"-{self.version}.dist-info"
dist_info_path = os.path.join(self.installdir, self.pylibdir, dist_info_name)
mkdir(dist_info_path, parents=True)

# install METADATA file
metadata_path = os.path.join(dist_info_path, 'METADATA')
write_file(metadata_path, '\n'.join(py_package_metadata))

self.log.info(f"Installation of dummy package for {self.name}-{self.version} successfull")
self.log.info(f"Installation of dummy package for {self.name}-{self.version} successfull: {metadata_path}")

def py_post_install_shenanigans(self, install_dir):
"""
Expand Down Expand Up @@ -1222,15 +1222,15 @@ def sanity_check_step(self, *args, **kwargs):
# (we can not pass this via custom_paths, since then the %(pyshortver)s template value will not be resolved)
if not self.is_extension:
site_package_dir = os.path.join('lib', 'python%(pyshortver)s', 'site-packages')
default_sanity_dirs = [site_package_dir]

custom_paths_files = []
if self.cfg.get('dummy_package', False):
dist_info_name = f"{self.name.replace('-','_')}-{self.version}.dist-info"
default_sanity_dirs.append(os.path.join(site_package_dir, dist_info_name))
dist_info_name = self.name.replace('-', '_') + f'-{self.version}.dist-info'
custom_paths_files.append(os.path.join(site_package_dir, dist_info_name, 'METADATA'))

kwargs.setdefault('custom_paths', {
'files': [],
'dirs': default_sanity_dirs,
'files': custom_paths_files,
'dirs': [site_package_dir],
})

# make sure 'exts_filter' argument is defined, which is used for sanity check
Expand Down
Loading