Skip to content

Commit 21ac77c

Browse files
author
Samuel Moors
committed
add dataset moduleclass
1 parent 9218551 commit 21ac77c

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

easybuild/framework/easyblock.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ def __init__(self, ec):
207207
# determine install subdirectory, based on module name
208208
self.install_subdir = None
209209

210+
# indicates whether build should be performed in installation dir
211+
self.build_in_installdir = self.cfg['buildininstalldir']
212+
210213
# list of locations to include in RPATH filter used by toolchain
211214
self.rpath_filter_dirs = []
212215

@@ -259,16 +262,6 @@ def __init__(self, ec):
259262
# initialize logger
260263
self._init_log()
261264

262-
if self.cfg['sources'] and self.cfg['data_sources']:
263-
raise EasyBuildError("Either easyconfig parameter sources or data_sources should be provided, not both.")
264-
265-
# build_in_installdir indicates whether build should be performed in installation dir
266-
if self.cfg['data_sources']:
267-
self.build_in_installdir = True
268-
self.log.info("Setting build_in_installdir to True for data installations.")
269-
else:
270-
self.build_in_installdir = self.cfg['buildininstalldir']
271-
272265
# try and use the specified group (if any)
273266
group_name = build_option('group')
274267
group_spec = self.cfg['group']

easybuild/tools/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
446446
('chem', "Chemistry, Computational Chemistry and Quantum Chemistry"),
447447
('compiler', "Compilers"),
448448
('data', "Data management & processing tools"),
449+
('dataset', "Datasets"),
449450
('debugger', "Debuggers"),
450451
('devel', "Development tools"),
451452
('geo', "Earth Sciences"),

0 commit comments

Comments
 (0)