From 2ed73d510250af7fec7b96ad00b21067d26372f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Thu, 15 Aug 2024 20:32:45 +0200 Subject: [PATCH] Add more reliable way to detect Python dep --- easybuild/easyblocks/generic/pythonbundle.py | 5 +++-- easybuild/easyblocks/generic/pythonpackage.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/easybuild/easyblocks/generic/pythonbundle.py b/easybuild/easyblocks/generic/pythonbundle.py index ba3815ab61..373a076fd0 100644 --- a/easybuild/easyblocks/generic/pythonbundle.py +++ b/easybuild/easyblocks/generic/pythonbundle.py @@ -134,8 +134,9 @@ def make_module_extra(self, *args, **kwargs): # update $EBPYTHONPREFIXES rather than $PYTHONPATH # if this Python package was installed for multiple Python versions # or if we prefer it - use_ebpythonprefixes = get_software_root('Python') and build_option('prefer_ebpythonprefixes') and \ - self.cfg['prefer_ebpythonprefixes'] + runtime_deps = [dep['name'] for dep in self.cfg.dependencies(runtime_only=True)] + use_ebpythonprefixes = 'Python' in runtime_deps and \ + build_option('prefer_ebpythonprefixes') and self.cfg['prefer_ebpythonprefixes'] if self.multi_python or use_ebpythonprefixes: if EBPYTHONPREFIXES not in self.module_generator.added_paths_per_key: txt += self.module_generator.prepend_paths(EBPYTHONPREFIXES, '') diff --git a/easybuild/easyblocks/generic/pythonpackage.py b/easybuild/easyblocks/generic/pythonpackage.py index d9a11da3e9..57609ad522 100644 --- a/easybuild/easyblocks/generic/pythonpackage.py +++ b/easybuild/easyblocks/generic/pythonpackage.py @@ -1126,9 +1126,9 @@ def make_module_extra(self, *args, **kwargs): # update $EBPYTHONPREFIXES rather than $PYTHONPATH # if this Python package was installed for multiple Python versions # or if we prefer it - - use_ebpythonprefixes = get_software_root('Python') and build_option('prefer_ebpythonprefixes') and \ - self.cfg['prefer_ebpythonprefixes'] + runtime_deps = [dep['name'] for dep in self.cfg.dependencies(runtime_only=True)] + use_ebpythonprefixes = 'Python' in runtime_deps and \ + build_option('prefer_ebpythonprefixes') and self.cfg['prefer_ebpythonprefixes'] if self.multi_python or use_ebpythonprefixes: txt += self.module_generator.prepend_paths(EBPYTHONPREFIXES, '') elif self.require_python: