Skip to content

Commit 38e19f1

Browse files
MicketC3SE "c3-builder" bot
authored and
C3SE "c3-builder" bot
committed
Fix name EBPYTHONPREFIX to EBPYTHONPREFIXES which is used in sitecustomize.py
1 parent 85d3f18 commit 38e19f1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

easybuild/tools/module_generator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ def update_paths(self, key, paths, prepend=True, allow_abs=False, expand_relpath
274274
# replace with EBPYTHONPREFIX which is added to python sys path at runtime
275275
if python_paths and build_option('prefer_ebpythonprefix_over_pythonpath'):
276276
python_path = python_paths[0]
277-
self.log.info("Replaced PYTHONPATH %s with EBPYTHONPREFIX", python_path)
278-
ret = self._update_paths('EBPYTHONPREFIX', [''], prepend, allow_abs, expand_relpaths)
277+
self.log.info("Replaced PYTHONPATH %s with EBPYTHONPREFIXES", python_path)
278+
ret = self._update_paths('EBPYTHONPREFIXES', [''], prepend, allow_abs, expand_relpaths)
279279
paths = [path for path in paths if path != python_path]
280280
if paths:
281281
ret += self._update_paths(key, paths, prepend, allow_abs, expand_relpaths)

test/framework/module_generator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ def append_paths(*args, **kwargs):
694694
res = append_paths('key', ['1234@example.com'], expand_relpaths=False)
695695
self.assertEqual("append-path\tkey\t\t1234@example.com\n", res)
696696

697-
expected = "append-path\tEBPYTHONPREFIX\t\t$root\nappend-path\tPYTHONPATH\t\t$root/foo\n"
697+
expected = "append-path\tEBPYTHONPREFIXES\t\t$root\nappend-path\tPYTHONPATH\t\t$root/foo\n"
698698
res = append_paths('PYTHONPATH', ['lib/python3.12/site-packages', 'foo'])
699699
self.assertEqual(expected, res)
700700
else:
@@ -717,7 +717,7 @@ def append_paths(*args, **kwargs):
717717
res = append_paths('key', ['1234@example.com'], expand_relpaths=False)
718718
self.assertEqual('append_path("key", "1234@example.com")\n', res)
719719

720-
expected = 'append_path("EBPYTHONPREFIX", root)\nappend_path("PYTHONPATH", pathJoin(root, "foo"))\n'
720+
expected = 'append_path("EBPYTHONPREFIXES", root)\nappend_path("PYTHONPATH", pathJoin(root, "foo"))\n'
721721
res = append_paths('PYTHONPATH', ['lib/python3.12/site-packages', 'foo'])
722722
self.assertEqual(expected, res)
723723

0 commit comments

Comments
 (0)