Merge pull request #3681 from Flamefire/super-calls

Remove Python2 style `super()`-calls and fix ExtensionEasyBlock

Author: lexming

easybuild/easyblocks/a/abaqus.py

@@ -60,7 +60,7 @@ def extra_options():
 
     def __init__(self, *args, **kwargs):
         """Initialisation of custom class variables for ABAQUS."""
-        super(EB_ABAQUS, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.replayfile = None
 
         if self.cfg['with_tosca'] is None and LooseVersion(self.version) >= LooseVersion('2020'):
@@ -222,7 +222,7 @@ def install_step(self):
                 self.cfg['install_cmd'] += " -replay %s" % self.replayfile
                 if LooseVersion(self.version) < LooseVersion("6.13"):
                     self.cfg['install_cmd'] += " -nosystemcheck"
-            super(EB_ABAQUS, self).install_step()
+            super().install_step()
 
         if LooseVersion(self.version) >= LooseVersion('2016'):
             # also install hot fixes (if any)
@@ -357,11 +357,11 @@ def sanity_check_step(self):
         if self.cfg['with_tosca']:
             custom_commands.append("ToscaPython.sh --help")
 
-        super(EB_ABAQUS, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
+        super().sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
 
     def make_module_extra(self):
         """Add LM_LICENSE_FILE path if specified"""
-        txt = super(EB_ABAQUS, self).make_module_extra()
+        txt = super().make_module_extra()
         license_file = os.getenv('EB_ABAQUS_LICENSE_FILE', None)
         if license_file is not None:
             txt += self.module_generator.prepend_paths('ABAQUSLM_LICENSE_FILE', [license_file], allow_abs=True)

easybuild/easyblocks/a/adf.py

@@ -41,15 +41,15 @@ class EB_ADF(EasyBlock):
 
     def __init__(self, *args, **kwargs):
         """Initialisation of custom class variables for ADF."""
-        super(EB_ADF, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.build_in_installdir = True
 
     def extract_step(self):
         """Extract sources."""
         # strip off 'adf<version>' part to avoid having everything in a subdirectory
         self.cfg['unpack_options'] = "--strip-components=1"
-        super(EB_ADF, self).extract_step()
+        super().extract_step()
 
     def configure_step(self):
         """Custom configuration procedure for ADF."""
@@ -89,11 +89,11 @@ def sanity_check_step(self):
             'files': ['bin/adf'],
             'dirs': ['atomicdata', 'examples'],
         }
-        super(EB_ADF, self).sanity_check_step(custom_paths=custom_paths)
+        super().sanity_check_step(custom_paths=custom_paths)
 
     def make_module_extra(self):
         """Custom extra module file entries for ADF."""
-        txt = super(EB_ADF, self).make_module_extra()
+        txt = super().make_module_extra()
 
         txt += self.module_generator.set_environment('ADFHOME', self.installdir)
         txt += self.module_generator.set_environment('ADFBIN', os.path.join(self.installdir, 'bin'))

easybuild/easyblocks/a/advisor.py

@@ -45,7 +45,7 @@ class EB_Advisor(IntelBase):
 
     def __init__(self, *args, **kwargs):
         """Constructor, initialize class variables."""
-        super(EB_Advisor, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if LooseVersion(self.version) < LooseVersion('2020'):
             raise EasyBuildError(
@@ -63,10 +63,10 @@ def __init__(self, *args, **kwargs):
     def prepare_step(self, *args, **kwargs):
         """Since 2019u3 there is no license required."""
         kwargs['requires_runtime_license'] = False
-        super(EB_Advisor, self).prepare_step(*args, **kwargs)
+        super().prepare_step(*args, **kwargs)
 
     def sanity_check_step(self):
         """Custom sanity check paths for Advisor"""
         binaries = ['advixe-cl', 'advixe-feedback', 'advixe-gui', 'advixe-runss', 'advixe-runtrc', 'advixe-runtc']
         custom_paths = self.get_custom_paths_tools(binaries)
-        super(EB_Advisor, self).sanity_check_step(custom_paths=custom_paths)
+        super().sanity_check_step(custom_paths=custom_paths)

easybuild/easyblocks/a/aedt.py

@@ -43,7 +43,7 @@ class EB_AEDT(PackedBinary):
 
     def __init__(self, *args, **kwargs):
         """Initialize Ansys Electronics Desktop specific variables."""
-        super(EB_AEDT, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.subdir = None
 
     def _set_subdir(self):
@@ -120,7 +120,7 @@ def post_processing_step(self):
     def make_module_extra(self):
         """Extra module entries for Ansys Electronics Desktop."""
 
-        txt = super(EB_AEDT, self).make_module_extra()
+        txt = super().make_module_extra()
         ver = LooseVersion(self.version)
         short_ver = self.version[2:].replace('R', '')
 
@@ -160,4 +160,4 @@ def sanity_check_step(self):
             inpfile = os.path.join(tempdir, 'sm-1.aedt')
             custom_commands = ['ansysedt -ng -batchsolve -Distributed -monitor %s' % inpfile]
 
-            super(EB_AEDT, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
+        super().sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)

easybuild/easyblocks/a/amber.py

@@ -68,7 +68,7 @@ def extra_options(extra_vars=None):
 
     def __init__(self, *args, **kwargs):
         """Easyblock constructor: initialise class variables."""
-        super(EB_Amber, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if LooseVersion(self.version) < LooseVersion('20'):
             # Build Amber <20 in install directory
@@ -83,7 +83,7 @@ def __init__(self, *args, **kwargs):
     def extract_step(self):
         """Extract sources; strip off parent directory during unpack"""
         self.cfg.update('unpack_options', "--strip-components=1")
-        super(EB_Amber, self).extract_step()
+        super().extract_step()
 
     def patch_step(self, *args, **kwargs):
         """Patch Amber using 'update_amber' tool, prior to applying listed patch files (if any)."""
@@ -118,7 +118,7 @@ def patch_step(self, *args, **kwargs):
                 for _ in range(self.cfg['patchruns']):
                     run_shell_cmd(cmd)
 
-        super(EB_Amber, self).patch_step(*args, **kwargs)
+        super().patch_step(*args, **kwargs)
 
     def configure_step(self):
         """Apply the necessary CMake config opts."""
@@ -203,15 +203,15 @@ def configure_step(self):
         self.cfg.update('configopts', '-DCOMPILER=AUTO')
 
         # configure using cmake
-        super(EB_Amber, self).configure_step()
+        super().configure_step()
 
     def build_step(self):
         """Build Amber"""
         if LooseVersion(self.version) < LooseVersion('20'):
             # Building Amber < 20 is done in install step.
             return
 
-        super(EB_Amber, self).build_step()
+        super().build_step()
 
     def test_step(self):
         """Testing Amber build is done in install step."""
@@ -308,7 +308,7 @@ def configuremake_install_step(self):
 
             # build in situ using 'make install'
             # note: not 'build'
-            super(EB_Amber, self).install_step()
+            super().install_step()
 
             # test
             if self.cfg['runtest']:
@@ -325,7 +325,7 @@ def install_step(self):
             self.configuremake_install_step()
             return
 
-        super(EB_Amber, self).install_step()
+        super().install_step()
 
         # Run the tests located in the build directory
         if self.cfg['runtest']:
@@ -374,11 +374,11 @@ def sanity_check_step(self):
             'files': [os.path.join(self.installdir, 'bin', binary) for binary in binaries],
             'dirs': [],
         }
-        super(EB_Amber, self).sanity_check_step(custom_paths=custom_paths)
+        super().sanity_check_step(custom_paths=custom_paths)
 
     def make_module_extra(self):
         """Add module entries specific to Amber/AmberTools"""
-        txt = super(EB_Amber, self).make_module_extra()
+        txt = super().make_module_extra()
 
         txt += self.module_generator.set_environment('AMBERHOME', self.installdir)
 

easybuild/easyblocks/a/anaconda.py

@@ -77,4 +77,4 @@ def sanity_check_step(self):
             'files': [os.path.join('bin', x) for x in ['2to3', 'conda', 'pydoc', 'python', 'sqlite3']],
             'dirs': ['bin', 'etc', 'lib', 'pkgs'],
         }
-        super(EB_Anaconda, self).sanity_check_step(custom_paths=custom_paths)
+        super().sanity_check_step(custom_paths=custom_paths)

easybuild/easyblocks/a/ansys.py

@@ -44,7 +44,7 @@ class EB_ANSYS(PackedBinary):
 
     def __init__(self, *args, **kwargs):
         """Initialize ANSYS-specific variables."""
-        super(EB_ANSYS, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.ansysver = None
 
         # custom extra module environment entries for ANSYS
@@ -107,7 +107,7 @@ def make_module_extra(self):
         if self.ansysver is None:
             self.set_ansysver()
 
-        txt = super(EB_ANSYS, self).make_module_extra()
+        txt = super().make_module_extra()
         icem_acn = os.path.join(self.installdir, self.ansysver, 'icemcfd', 'linux64_amd')
         txt += self.module_generator.set_environment('ICEM_ACN', icem_acn)
         return txt
@@ -122,4 +122,4 @@ def sanity_check_step(self):
             'files': [os.path.join(self.ansysver, 'fluent', 'bin', 'fluent%s' % x) for x in ['', '_arch', '_sysinfo']],
             'dirs': [os.path.join(self.ansysver, x) for x in ['ansys', 'aisol', 'CFD-Post', 'CFX']]
         }
-        super(EB_ANSYS, self).sanity_check_step(custom_paths=custom_paths)
+        super().sanity_check_step(custom_paths=custom_paths)

easybuild/easyblocks/a/aocc.py

@@ -80,7 +80,7 @@ def extra_options():
 
     def __init__(self, *args, **kwargs):
         """Easyblock constructor, define custom class variables specific to AOCC."""
-        super(EB_AOCC, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.clangversion = self.cfg['clangversion']
         # AOCC is based on Clang. Try to guess the clangversion from the AOCC version
@@ -209,7 +209,7 @@ def install_step(self):
         # or via 'accept_eula = True' in easyconfig file
         self.check_accepted_eula(more_info='http://developer.amd.com/wordpress/media/files/AOCC_EULA.pdf')
 
-        super(EB_AOCC, self).install_step()
+        super().install_step()
 
     def post_processing_step(self):
         """
@@ -245,7 +245,7 @@ def post_processing_step(self):
 
         self._create_compiler_config_files(compilers_to_add_config_files)
         self._create_compiler_wrappers(compilers_to_wrap)
-        super(EB_AOCC, self).post_processing_step()
+        super().post_processing_step()
 
     def sanity_check_step(self):
         """Custom sanity check for AOCC, based on sanity check for Clang."""
@@ -288,11 +288,11 @@ def sanity_check_step(self):
         minimal_f90_compiler_cmd = "cd %s && flang minimal.f90 -o minimal_f90" % tmpdir
         custom_commands.append(minimal_f90_compiler_cmd)
 
-        super(EB_AOCC, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
+        super().sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
 
     def make_module_extra(self):
         """Custom variables for AOCC module."""
-        txt = super(EB_AOCC, self).make_module_extra()
+        txt = super().make_module_extra()
         # we set the symbolizer path so that asan/tsan give meanfull output by default
         asan_symbolizer_path = os.path.join(self.installdir, 'bin', 'llvm-symbolizer')
         txt += self.module_generator.set_environment('ASAN_SYMBOLIZER_PATH', asan_symbolizer_path)

easybuild/easyblocks/a/aomp.py

@@ -65,7 +65,7 @@ def extra_options():
 
     def __init__(self, *args, **kwargs):
         """Initialize custom class variables for Clang."""
-        super(EB_AOMP, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.cfg['extract_sources'] = True
         self.cfg['dontcreateinstalldir'] = True
         # Bypass the .mod file check for GCCcore installs
@@ -130,7 +130,7 @@ def configure_step(self):
         self.cfg['installopts'] = 'select ' + ' '.join(components)
 
     def post_processing_step(self):
-        super(EB_AOMP, self).post_processing_step()
+        super().post_processing_step()
         # The install script will create a symbolic link as the install
         # directory, this creates problems for EB as it won't remove the
         # symlink. To remedy this we remove the link here and rename the actual
@@ -190,4 +190,4 @@ def sanity_check_step(self):
             'aompcc --help', 'clang --help', 'clang++ --help', 'flang --help',
             'llvm-config --cxxflags',
         ]
-        super(EB_AOMP, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
+        super().sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)

easybuild/easyblocks/a/armadillo.py

@@ -59,7 +59,7 @@ def configure_step(self):
         self.cfg.update('configopts', '-DBLAS_LIBRARY:PATH="%s"' % os.getenv('LIBBLAS'))
         self.cfg.update('configopts', '-DLAPACK_LIBRARY:PATH="%s"' % os.getenv('LIBLAPACK'))
 
-        super(EB_Armadillo, self).configure_step()
+        super().configure_step()
 
     def sanity_check_step(self):
         """Custom sanity check for Armadillo."""
@@ -72,4 +72,4 @@ def sanity_check_step(self):
             'files': ['include/armadillo', os.path.join(libdir, 'libarmadillo.%s' % get_shared_lib_ext())],
             'dirs': ['include/armadillo_bits'],
         }
-        super(EB_Armadillo, self).sanity_check_step(custom_paths=custom_paths)
+        super().sanity_check_step(custom_paths=custom_paths)