Merge pull request #16665 from lexming/20221116171112_new_pr_IJulia1233

switch IJulia and MultilevelEstimators to JuliaBundle easyblock
easybuilders · Nov 25, 2022 · 254c8c6 · 254c8c6
2 parents 0248e8a + 1218b03
commit 254c8c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/easybuild/easyconfigs/i/IJulia/IJulia-1.23.3-Julia-1.6.7.eb b/easybuild/easyconfigs/i/IJulia/IJulia-1.23.3-Julia-1.6.7.eb
@@ -1,4 +1,4 @@
-easyblock = 'Bundle'
+easyblock = 'JuliaBundle'
 
 name = 'IJulia'
 version = '1.23.3'
@@ -14,12 +14,6 @@ dependencies = [
     ('Julia', _julia_ver, '-linux-%s' % ARCH, SYSTEM),
 ]
 
-exts_defaultclass = 'JuliaPackage'
-exts_filter = ("julia -e 'using %(ext_name)s'", "")
-exts_default_options = {
-    'sources': [{'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}],
-}
-
 exts_list = [
     ('Parsers', '2.4.2', {
         'source_urls': ['https://github.com/JuliaData/Parsers.jl/archive/'],
@@ -74,13 +68,7 @@ exts_list = [
     }),
 ]
 
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['packages'],
-}
-
 modextrapaths = {
-    'JULIA_DEPOT_PATH': '',
     'JUPYTER_PATH': 'jupyter',
 }
 

diff --git a/...d/easyconfigs/m/MultilevelEstimators/MultilevelEstimators-0.1.0-GCC-11.2.0-Julia-1.7.2.eb b/...d/easyconfigs/m/MultilevelEstimators/MultilevelEstimators-0.1.0-GCC-11.2.0-Julia-1.7.2.eb
@@ -1,4 +1,4 @@
-easyblock = 'Bundle'
+easyblock = 'JuliaBundle'
 
 name = 'MultilevelEstimators'
 version = '0.1.0'
@@ -15,12 +15,6 @@ dependencies = [
     ('Julia', local_julia_ver, '-linux-%s' % ARCH, SYSTEM),
 ]
 
-exts_defaultclass = 'JuliaPackage'
-exts_filter = ("julia -e 'using %(ext_name)s'", "")
-exts_default_options = {
-    'sources': [{'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}],
-}
-
 exts_list = [
     ('Preferences', '1.3.0', {
         'source_urls': ['https://github.com/JuliaPackaging/Preferences.jl/archive/'],
@@ -101,13 +95,4 @@ exts_list = [
     }),
 ]
 
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['packages/%(name)s']
-}
-
-modextrapaths = {
-    'JULIA_DEPOT_PATH': '',
-}
-
 moduleclass = 'lib'
diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
@@ -1092,9 +1092,9 @@ def test_pr_sanity_check_paths(self):
         """Make sure a custom sanity_check_paths value is specified for easyconfigs that use a generic easyblock."""
 
         # some generic easyblocks already have a decent customised sanity_check_paths,
-        # including CMakePythonPackage, GoPackage, PythonBundle & PythonPackage;
+        # including CMakePythonPackage, GoPackage, JuliaBundle, PythonBundle & PythonPackage;
         # BuildEnv, ModuleRC and Toolchain easyblocks doesn't install anything so there is nothing to check.
-        whitelist = ['BuildEnv', 'CMakePythonPackage', 'CrayToolchain', 'GoPackage', 'ModuleRC',
+        whitelist = ['BuildEnv', 'CMakePythonPackage', 'CrayToolchain', 'GoPackage', 'JuliaBundle', 'ModuleRC',
                      'PythonBundle', 'PythonPackage', 'Toolchain']
         # Bundles of dependencies without files of their own
         # Autotools: Autoconf + Automake + libtool, (recent) GCC: GCCcore + binutils, CUDA: GCC + CUDAcore,