Skip to content

Commit 740102c

Browse files
committed
Drop lib64 variant as it's not supported by sitecustomize.py
Our sitecustomize.py only considers the lib/pythonx.xx/site-packages paths anyway, so we must not consider any more when adding the automatic paths.
1 parent a7c8a3b commit 740102c

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

easybuild/framework/easyblock.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,16 +1430,9 @@ def make_module_extra(self, altroot=None, altversion=None):
14301430

14311431
# Add automatic PYTHONPATH or EBPYTHONPREFIXES if they aren't already present and python paths exist
14321432
if not os.path.isfile(f'{self.installdir}/bin/python'): # only needed when not a base python installation
1433-
# Exclude symlinks lib -> lib64 or vice verse to avoid duplicates
1434-
python_paths = []
1435-
if not os.path.islink(f'{self.installdir}/lib'):
1436-
python_paths += [path[len(self.installdir)+1:]
1437-
for path in glob.glob(f'{self.installdir}/lib/python*/site-packages')
1438-
if re.match(self.installdir + r'/lib/python\d+\.\d+/site-packages', path)]
1439-
if not os.path.islink(f'{self.installdir}/lib64'):
1440-
python_paths += [path[len(self.installdir)+1:]
1441-
for path in glob.glob(f'{self.installdir}/lib64/python*/site-packages')
1442-
if re.match(self.installdir + r'/lib64/python\d+\.\d+/site-packages', path)]
1433+
python_paths = [path[len(self.installdir)+1:]
1434+
for path in glob.glob(f'{self.installdir}/lib/python*/site-packages')
1435+
if re.match(self.installdir + r'/lib/python\d+\.\d+/site-packages', path)]
14431436

14441437
runtime_deps = [dep['name'] for dep in self.cfg.dependencies(runtime_only=True)]
14451438
use_ebpythonprefixes = 'Python' in runtime_deps and \

0 commit comments

Comments
 (0)