Merge branch 'develop' into sanity_check_only

Author: boegel

.github/workflows/bootstrap_script.yml

@@ -17,7 +17,8 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python: [2.7, 3.6, 3.7, 3.8, 3.9]
+        # Don't run for Python 3.8, 3.9 , people should just use `pip install easybuild`
+        python: [2.7, 3.6, 3.7]
         modules_tool:
           # use variables defined by 'setup' job above, see also
           # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#needs-context

contrib/hooks/hpc2n_hooks.py

@@ -162,21 +162,19 @@ def pre_module_hook(self, *args, **kwargs):
         self.log.info("[pre-module hook] Set I_MPI_PMI_LIBRARY in impi module")
         # Must be done this way, updating self.cfg['modextravars']
         # directly doesn't work due to templating.
-        en_templ = self.cfg.enable_templating
-        self.cfg.enable_templating = False
-        shlib_ext = get_shared_lib_ext()
-        pmix_root = get_software_root('PMIx')
-        if pmix_root:
-            mpi_type = 'pmix_v3'
-            self.cfg['modextravars'].update({
-                'I_MPI_PMI_LIBRARY': os.path.join(pmix_root, "lib", "libpmi." + shlib_ext)
-            })
-            self.cfg['modextravars'].update({'SLURM_MPI_TYPE': mpi_type})
-            # Unfortunately UCX doesn't yet work for unknown reasons. Make sure it is off.
-            self.cfg['modextravars'].update({'SLURM_PMIX_DIRECT_CONN_UCX': 'false'})
-        else:
-            self.cfg['modextravars'].update({'I_MPI_PMI_LIBRARY': "/lap/slurm/lib/libpmi.so"})
-        self.cfg.enable_templating = en_templ
+        with self.cfg.disable_templating():
+            shlib_ext = get_shared_lib_ext()
+            pmix_root = get_software_root('PMIx')
+            if pmix_root:
+                mpi_type = 'pmix_v3'
+                self.cfg['modextravars'].update({
+                    'I_MPI_PMI_LIBRARY': os.path.join(pmix_root, "lib", "libpmi." + shlib_ext)
+                })
+                self.cfg['modextravars'].update({'SLURM_MPI_TYPE': mpi_type})
+                # Unfortunately UCX doesn't yet work for unknown reasons. Make sure it is off.
+                self.cfg['modextravars'].update({'SLURM_PMIX_DIRECT_CONN_UCX': 'false'})
+            else:
+                self.cfg['modextravars'].update({'I_MPI_PMI_LIBRARY': "/lap/slurm/lib/libpmi.so"})
 
     if self.name == 'OpenBLAS':
         self.log.info("[pre-module hook] Set OMP_NUM_THREADS=1 in OpenBLAS module")
@@ -197,18 +195,14 @@ def pre_module_hook(self, *args, **kwargs):
         self.log.info("[pre-module hook] Set SLURM_MPI_TYPE=%s in OpenMPI module" % mpi_type)
         # Must be done this way, updating self.cfg['modextravars']
         # directly doesn't work due to templating.
-        en_templ = self.cfg.enable_templating
-        self.cfg.enable_templating = False
-        self.cfg['modextravars'].update({'SLURM_MPI_TYPE': mpi_type})
-        # Unfortunately UCX doesn't yet work for unknown reasons. Make sure it is off.
-        self.cfg['modextravars'].update({'SLURM_PMIX_DIRECT_CONN_UCX': 'false'})
-        self.cfg.enable_templating = en_templ
+        with self.cfg.disable_templating():
+            self.cfg['modextravars'].update({'SLURM_MPI_TYPE': mpi_type})
+            # Unfortunately UCX doesn't yet work for unknown reasons. Make sure it is off.
+            self.cfg['modextravars'].update({'SLURM_PMIX_DIRECT_CONN_UCX': 'false'})
 
     if self.name == 'PMIx':
         # This is a, hopefully, temporary workaround for https://github.com/pmix/pmix/issues/1114
         if LooseVersion(self.version) > LooseVersion('2') and LooseVersion(self.version) < LooseVersion('3'):
             self.log.info("[pre-module hook] Set PMIX_MCA_gds=^ds21 in PMIx module")
-            en_templ = self.cfg.enable_templating
-            self.cfg.enable_templating = False
-            self.cfg['modextravars'].update({'PMIX_MCA_gds': '^ds21'})
-            self.cfg.enable_templating = en_templ
+            with self.cfg.disable_templating():
+                self.cfg['modextravars'].update({'PMIX_MCA_gds': '^ds21'})

easybuild/base/generaloption.py

@@ -40,13 +40,30 @@
 from functools import reduce
 from optparse import Option, OptionGroup, OptionParser, OptionValueError, Values
 from optparse import SUPPRESS_HELP as nohelp  # supported in optparse of python v2.4
-from optparse import gettext as _gettext  # this is gettext.gettext normally
 
 from easybuild.base.fancylogger import getLogger, setroot, setLogLevel, getDetailsLogLevels
 from easybuild.base.optcomplete import autocomplete, CompleterOption
 from easybuild.tools.py2vs3 import StringIO, configparser, string_type
 from easybuild.tools.utilities import mk_rst_table, nub, shell_quote
 
+try:
+    import gettext
+    eb_translation = None
+
+    def get_translation():
+        global eb_translation
+        if not eb_translation:
+            # Finding a translation is expensive, so do only once
+            domain = gettext.textdomain()
+            eb_translation = gettext.translation(domain, gettext.bindtextdomain(domain), fallback=True)
+        return eb_translation
+
+    def _gettext(message):
+        return get_translation().gettext(message)
+except ImportError:
+    def _gettext(message):
+        return message
+
 
 HELP_OUTPUT_FORMATS = ['', 'rst', 'short', 'config']