From 67bb99069cb26f128c939076df7a3125a9deed71 Mon Sep 17 00:00:00 2001 From: Samuel Moors Date: Fri, 24 May 2024 20:05:17 +0200 Subject: [PATCH 1/2] avoid sanity check on the software itself for CargoPythonBundle easyblock --- easybuild/easyblocks/generic/cargopythonbundle.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/easybuild/easyblocks/generic/cargopythonbundle.py b/easybuild/easyblocks/generic/cargopythonbundle.py index 090a38dff4..117004dc2b 100644 --- a/easybuild/easyblocks/generic/cargopythonbundle.py +++ b/easybuild/easyblocks/generic/cargopythonbundle.py @@ -53,6 +53,14 @@ def __init__(self, *args, **kwargs): self.check_for_sources = False # make Bundle allow sources (as crates are treated as sources) super(CargoPythonBundle, self).__init__(*args, **kwargs) + # Cargo inherits from ExtensionEasyBlock, thus EB treats the software itself as an extension + # Setting modulename to False to ensure that sanity checks are performed on the extensions only + self.options = {'modulename': False} + def extract_step(self): """Specifically use the overloaded variant from Cargo as is populates vendored sources with checksums.""" return Cargo.extract_step(self) + + # def sanity_check_step(self, *args, **kwargs): + # self.cfg['sources'] = None + # super(CargoPythonBundle, self).sanity_check_step(*args, **kwargs) From fa440b18992685e1e9fa9e9f333273c05f4d7065 Mon Sep 17 00:00:00 2001 From: Samuel Moors Date: Fri, 24 May 2024 20:15:35 +0200 Subject: [PATCH 2/2] remove old comments --- easybuild/easyblocks/generic/cargopythonbundle.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/easybuild/easyblocks/generic/cargopythonbundle.py b/easybuild/easyblocks/generic/cargopythonbundle.py index 117004dc2b..d76ccde612 100644 --- a/easybuild/easyblocks/generic/cargopythonbundle.py +++ b/easybuild/easyblocks/generic/cargopythonbundle.py @@ -60,7 +60,3 @@ def __init__(self, *args, **kwargs): def extract_step(self): """Specifically use the overloaded variant from Cargo as is populates vendored sources with checksums.""" return Cargo.extract_step(self) - - # def sanity_check_step(self, *args, **kwargs): - # self.cfg['sources'] = None - # super(CargoPythonBundle, self).sanity_check_step(*args, **kwargs)