Skip to content

Commit 08a7ece

Browse files
committed
Fix use of list of paths
1 parent b56cb13 commit 08a7ece

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

easybuild/easyblocks/generic/juliapackage.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import os
3333
import re
3434
import tempfile
35+
from typing import List, Tuple
3536

3637
from easybuild.tools import LooseVersion
3738

@@ -163,7 +164,7 @@ def set_pkg_offline(self):
163164
)
164165
raise EasyBuildError(errmsg, julia_version)
165166

166-
def determine_clean_paths(self):
167+
def determine_clean_paths(self) -> Tuple[List[str], List[str]]:
167168
"""Determine cleaned DEPOT_PATH and LOAD_PATH excluding user depot paths."""
168169
# Grab both DEPOT_PATH and LOAD_PATH before any changes are made
169170
# given that Julia might automatically update LOAD_PATH from a change on DEPOT_PATH
@@ -327,7 +328,7 @@ def load_module(self, *args, **kwargs):
327328
else:
328329
# In older Julia versions the trailing colon doesn't prevent the user $HOME being added
329330
# So use the extra logic to avoid that, see https://github.com/easybuilders/easybuild-easyblocks/pull/4102
330-
depot_path, _ = self.determine_clean_paths()
331+
depot_path = os.pathsep.join(self.determine_clean_paths()[0])
331332
# Prepend a temporary directory so the install path is not affected by sanity checks
332333
env.setvar('JULIA_DEPOT_PATH', f"{self.tmp_depot_path}:{depot_path}")
333334
self.set_pkg_offline()
@@ -340,8 +341,7 @@ def sanity_check_step(self, *args, **kwargs):
340341
'dirs': [os.path.join('packages', self.name)],
341342
}
342343
kwargs.setdefault('custom_paths', custom_paths)
343-
344-
return super().sanity_check_step(EXTS_FILTER_JULIA_PACKAGES, *args, **kwargs)
344+
return ExtensionEasyBlock.sanity_check_step(self, EXTS_FILTER_JULIA_PACKAGES, *args, **kwargs)
345345

346346
def make_module_extra(self, *args, **kwargs):
347347
"""

0 commit comments

Comments
 (0)