Skip to content

Commit 254c8c6

Browse files
authored
Merge pull request #16665 from lexming/20221116171112_new_pr_IJulia1233
switch IJulia and MultilevelEstimators to JuliaBundle easyblock
2 parents 0248e8a + 1218b03 commit 254c8c6

File tree

3 files changed

+4
-31
lines changed

3 files changed

+4
-31
lines changed

easybuild/easyconfigs/i/IJulia/IJulia-1.23.3-Julia-1.6.7.eb

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
easyblock = 'Bundle'
1+
easyblock = 'JuliaBundle'
22

33
name = 'IJulia'
44
version = '1.23.3'
@@ -14,12 +14,6 @@ dependencies = [
1414
('Julia', _julia_ver, '-linux-%s' % ARCH, SYSTEM),
1515
]
1616

17-
exts_defaultclass = 'JuliaPackage'
18-
exts_filter = ("julia -e 'using %(ext_name)s'", "")
19-
exts_default_options = {
20-
'sources': [{'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}],
21-
}
22-
2317
exts_list = [
2418
('Parsers', '2.4.2', {
2519
'source_urls': ['https://github.com/JuliaData/Parsers.jl/archive/'],
@@ -74,13 +68,7 @@ exts_list = [
7468
}),
7569
]
7670

77-
sanity_check_paths = {
78-
'files': [],
79-
'dirs': ['packages'],
80-
}
81-
8271
modextrapaths = {
83-
'JULIA_DEPOT_PATH': '',
8472
'JUPYTER_PATH': 'jupyter',
8573
}
8674

easybuild/easyconfigs/m/MultilevelEstimators/MultilevelEstimators-0.1.0-GCC-11.2.0-Julia-1.7.2.eb

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
easyblock = 'Bundle'
1+
easyblock = 'JuliaBundle'
22

33
name = 'MultilevelEstimators'
44
version = '0.1.0'
@@ -15,12 +15,6 @@ dependencies = [
1515
('Julia', local_julia_ver, '-linux-%s' % ARCH, SYSTEM),
1616
]
1717

18-
exts_defaultclass = 'JuliaPackage'
19-
exts_filter = ("julia -e 'using %(ext_name)s'", "")
20-
exts_default_options = {
21-
'sources': [{'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}],
22-
}
23-
2418
exts_list = [
2519
('Preferences', '1.3.0', {
2620
'source_urls': ['https://github.com/JuliaPackaging/Preferences.jl/archive/'],
@@ -101,13 +95,4 @@ exts_list = [
10195
}),
10296
]
10397

104-
sanity_check_paths = {
105-
'files': [],
106-
'dirs': ['packages/%(name)s']
107-
}
108-
109-
modextrapaths = {
110-
'JULIA_DEPOT_PATH': '',
111-
}
112-
11398
moduleclass = 'lib'

test/easyconfigs/easyconfigs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,9 +1092,9 @@ def test_pr_sanity_check_paths(self):
10921092
"""Make sure a custom sanity_check_paths value is specified for easyconfigs that use a generic easyblock."""
10931093

10941094
# some generic easyblocks already have a decent customised sanity_check_paths,
1095-
# including CMakePythonPackage, GoPackage, PythonBundle & PythonPackage;
1095+
# including CMakePythonPackage, GoPackage, JuliaBundle, PythonBundle & PythonPackage;
10961096
# BuildEnv, ModuleRC and Toolchain easyblocks doesn't install anything so there is nothing to check.
1097-
whitelist = ['BuildEnv', 'CMakePythonPackage', 'CrayToolchain', 'GoPackage', 'ModuleRC',
1097+
whitelist = ['BuildEnv', 'CMakePythonPackage', 'CrayToolchain', 'GoPackage', 'JuliaBundle', 'ModuleRC',
10981098
'PythonBundle', 'PythonPackage', 'Toolchain']
10991099
# Bundles of dependencies without files of their own
11001100
# Autotools: Autoconf + Automake + libtool, (recent) GCC: GCCcore + binutils, CUDA: GCC + CUDAcore,

0 commit comments

Comments
 (0)