Skip to content

Commit f90a12b

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 11cffaa commit f90a12b

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
@@ -1440,16 +1440,9 @@ def make_module_extra(self, altroot=None, altversion=None):
14401440

14411441
# Add automatic PYTHONPATH or EBPYTHONPREFIXES if they aren't already present and python paths exist
14421442
if not os.path.isfile(f'{self.installdir}/bin/python'): # only needed when not a base python installation
1443-
# Exclude symlinks lib -> lib64 or vice verse to avoid duplicates
1444-
python_paths = []
1445-
if not os.path.islink(f'{self.installdir}/lib'):
1446-
python_paths += [path[len(self.installdir)+1:]
1447-
for path in glob.glob(f'{self.installdir}/lib/python*/site-packages')
1448-
if re.match(self.installdir + r'/lib/python\d+\.\d+/site-packages', path)]
1449-
if not os.path.islink(f'{self.installdir}/lib64'):
1450-
python_paths += [path[len(self.installdir)+1:]
1451-
for path in glob.glob(f'{self.installdir}/lib64/python*/site-packages')
1452-
if re.match(self.installdir + r'/lib64/python\d+\.\d+/site-packages', path)]
1443+
python_paths = [path[len(self.installdir)+1:]
1444+
for path in glob.glob(f'{self.installdir}/lib/python*/site-packages')
1445+
if re.match(self.installdir + r'/lib/python\d+\.\d+/site-packages', path)]
14531446

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

0 commit comments

Comments
 (0)