Skip to content

Commit

Permalink
remove force_pythonpath easyconfig paramter, can be re-introduced lat…
Browse files Browse the repository at this point in the history
…er if there's a real need for it
  • Loading branch information
boegel committed Sep 30, 2024
1 parent 76fec7b commit 11f132e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
5 changes: 1 addition & 4 deletions easybuild/framework/easyblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1409,10 +1409,7 @@ def make_module_pythonpath(self):
use_ebpythonprefixes = False
multi_deps = self.cfg['multi_deps']

if self.cfg['force_pythonpath']:
self.log.info("Using $PYTHONPATH to specify Python search path, since 'force_pythonpath' is set")

elif 'Python' in runtime_deps:
if 'Python' in runtime_deps:
self.log.info("Found Python runtime dependency, so considering $EBPYTHONPREFIXES...")

if build_option('prefer_python_search_path') == EBPYTHONPREFIXES:
Expand Down
1 change: 0 additions & 1 deletion easybuild/framework/easyconfig/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
'patches': [[], "List of patches to apply", BUILD],
'prebuildopts': ['', 'Extra options pre-passed to build command.', BUILD],
'preconfigopts': ['', 'Extra options pre-passed to configure.', BUILD],
'force_pythonpath': [False, "Force use of PYTHONPATH for python seearch path when possible.", BUILD],
'preinstallopts': ['', 'Extra prefix options for installation.', BUILD],
'pretestopts': ['', 'Extra prefix options for test.', BUILD],
'postinstallcmds': [[], 'Commands to run after the install step.', BUILD],
Expand Down
7 changes: 0 additions & 7 deletions test/framework/toy_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -4302,13 +4302,6 @@ def test_toy_python(self):
self.assertTrue(ebpythonprefixes_regex.search(toy_mod_txt),
f"Pattern '{ebpythonprefixes_regex.pattern}' found in: {toy_mod_txt}")

write_file(test_ec, test_ec_txt + "\ndependencies = [('Python', '3.6', '', SYSTEM)]\nforce_pythonpath = True")
self.run_test_toy_build_with_output(ec_file=test_ec, extra_args=args)
toy_mod_txt = read_file(toy_mod)

self.assertTrue(pythonpath_regex.search(toy_mod_txt),
f"Pattern '{pythonpath_regex.pattern}' found in: {toy_mod_txt}")


def suite():
""" return all the tests in this file """
Expand Down

0 comments on commit 11f132e

Please sign in to comment.