Merge pull request #3647 from lexming/fix-delattr-system

Micket · web-flow · commit 85745e52c09c · 2025-03-03T20:28:18.000+01:00
replace delattr with preferred `ModuleLoadEnvironment.remove` method in SystemCompiler and SystemMPI
diff --git a/easybuild/easyblocks/generic/systemcompiler.py b/easybuild/easyblocks/generic/systemcompiler.py
@@ -229,7 +229,7 @@ def make_module_step(self, fake=False):
                 )
                 module_vars = [str(env_var) for env_var in self.module_load_environment]
                 for env_var in module_vars:
-                    delattr(self.module_load_environment, env_var)
+                    self.module_load_environment.remove(env_var)
             else:
                 # rely on compiler class module step to generate standalone module
                 module_generator_class = self.compiler_class
diff --git a/easybuild/easyblocks/generic/systemmpi.py b/easybuild/easyblocks/generic/systemmpi.py
@@ -261,7 +261,7 @@ def make_module_step(self, fake=False):
                 )
                 module_vars = [str(env_var) for env_var in self.module_load_environment]
                 for env_var in module_vars:
-                    delattr(self.module_load_environment, env_var)
+                    self.module_load_environment.remove(env_var)
             else:
                 # determine system MPI easyblock module to generate standalone module
                 if self.cfg['name'] in ['OpenMPI', 'SpectrumMPI']:

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ def make_module_step(self, fake=False):`
`229`	`229`	`)`
`230`	`230`	`module_vars = [str(env_var) for env_var in self.module_load_environment]`
`231`	`231`	`for env_var in module_vars:`
`232`		`- delattr(self.module_load_environment, env_var)`
	`232`	`+ self.module_load_environment.remove(env_var)`
`233`	`233`	`else:`
`234`	`234`	`# rely on compiler class module step to generate standalone module`
`235`	`235`	`module_generator_class = self.compiler_class`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ def make_module_step(self, fake=False):`
`261`	`261`	`)`
`262`	`262`	`module_vars = [str(env_var) for env_var in self.module_load_environment]`
`263`	`263`	`for env_var in module_vars:`
`264`		`- delattr(self.module_load_environment, env_var)`
	`264`	`+ self.module_load_environment.remove(env_var)`
`265`	`265`	`else:`
`266`	`266`	`# determine system MPI easyblock module to generate standalone module`
`267`	`267`	`if self.cfg['name'] in ['OpenMPI', 'SpectrumMPI']:`