Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch IJulia and MultilevelEstimators to JuliaBundle easyblock #16665

Merged
merged 2 commits into from
Nov 25, 2022
Merged

switch IJulia and MultilevelEstimators to JuliaBundle easyblock #16665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59a8183
switch IJulia and MultilevelEstimators to JuliaBundle easyblock
lexming Nov 16, 2022
1218b03
make test_pr_sanity_check_paths aware of JuliaBundle
boegel Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions easybuild/easyconfigs/i/IJulia/IJulia-1.23.3-Julia-1.6.7.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
easyblock = 'Bundle'
easyblock = 'JuliaBundle'

name = 'IJulia'
version = '1.23.3'
Expand All @@ -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/'],
Expand Down Expand Up @@ -74,13 +68,7 @@ exts_list = [
}),
]

sanity_check_paths = {
'files': [],
'dirs': ['packages'],
}

modextrapaths = {
'JULIA_DEPOT_PATH': '',
'JUPYTER_PATH': 'jupyter',
}

Expand Down
17 changes: 1 addition & 16 deletions ...d/easyconfigs/m/MultilevelEstimators/MultilevelEstimators-0.1.0-GCC-11.2.0-Julia-1.7.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
easyblock = 'Bundle'
easyblock = 'JuliaBundle'

name = 'MultilevelEstimators'
version = '0.1.0'
Expand All @@ -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/'],
Expand Down Expand Up @@ -101,13 +95,4 @@ exts_list = [
}),
]

sanity_check_paths = {
'files': [],
'dirs': ['packages/%(name)s']
}

modextrapaths = {
'JULIA_DEPOT_PATH': '',
}

moduleclass = 'lib'
4 changes: 2 additions & 2 deletions test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down