Skip to content

Commit 11f132e

Browse files
committed
remove force_pythonpath easyconfig paramter, can be re-introduced later if there's a real need for it
1 parent 76fec7b commit 11f132e

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

easybuild/framework/easyblock.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,10 +1409,7 @@ def make_module_pythonpath(self):
14091409
use_ebpythonprefixes = False
14101410
multi_deps = self.cfg['multi_deps']
14111411

1412-
if self.cfg['force_pythonpath']:
1413-
self.log.info("Using $PYTHONPATH to specify Python search path, since 'force_pythonpath' is set")
1414-
1415-
elif 'Python' in runtime_deps:
1412+
if 'Python' in runtime_deps:
14161413
self.log.info("Found Python runtime dependency, so considering $EBPYTHONPREFIXES...")
14171414

14181415
if build_option('prefer_python_search_path') == EBPYTHONPREFIXES:

easybuild/framework/easyconfig/default.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
'patches': [[], "List of patches to apply", BUILD],
116116
'prebuildopts': ['', 'Extra options pre-passed to build command.', BUILD],
117117
'preconfigopts': ['', 'Extra options pre-passed to configure.', BUILD],
118-
'force_pythonpath': [False, "Force use of PYTHONPATH for python seearch path when possible.", BUILD],
119118
'preinstallopts': ['', 'Extra prefix options for installation.', BUILD],
120119
'pretestopts': ['', 'Extra prefix options for test.', BUILD],
121120
'postinstallcmds': [[], 'Commands to run after the install step.', BUILD],

test/framework/toy_build.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4302,13 +4302,6 @@ def test_toy_python(self):
43024302
self.assertTrue(ebpythonprefixes_regex.search(toy_mod_txt),
43034303
f"Pattern '{ebpythonprefixes_regex.pattern}' found in: {toy_mod_txt}")
43044304

4305-
write_file(test_ec, test_ec_txt + "\ndependencies = [('Python', '3.6', '', SYSTEM)]\nforce_pythonpath = True")
4306-
self.run_test_toy_build_with_output(ec_file=test_ec, extra_args=args)
4307-
toy_mod_txt = read_file(toy_mod)
4308-
4309-
self.assertTrue(pythonpath_regex.search(toy_mod_txt),
4310-
f"Pattern '{pythonpath_regex.pattern}' found in: {toy_mod_txt}")
4311-
43124305

43134306
def suite():
43144307
""" return all the tests in this file """

0 commit comments

Comments
 (0)