Merge remote-tracking branch 'upstream/develop' into rocm-toolchain

Author: Thyre

.github/workflows/unit_tests.yml

@@ -245,6 +245,7 @@ jobs:
             # try and make sure output of running tests is clean (no printed messages/warnings)
             IGNORE_PATTERNS="no GitHub token available"
             IGNORE_PATTERNS+="|skipping SvnRepository test"
+            IGNORE_PATTERNS+="|Skipping test_dep_graph"
             IGNORE_PATTERNS+="|requires Lmod as modules tool"
             IGNORE_PATTERNS+="|stty: 'standard input': Inappropriate ioctl for device"
             IGNORE_PATTERNS+="|CryptographyDeprecationWarning: Python 3.7"

RELEASE_NOTES

@@ -3,6 +3,33 @@ For more detailed information, please see the git log.
 
 These release notes can also be consulted at https://docs.easybuild.io/release-notes .
 
+v5.2.1 (20 Feb 2026)
+--------------------
+
+update/bugfix release
+
+- bug fixes:
+  - ignore stderr for `rocm-smi` during test report creation (#5087)
+  - use initially stored environment to determine GPU info for test reports (#5088)
+  - add back `easybuild.toolchains.compiler.nvhpc` as deprecated toolchain compiler (#5089, #5096, #5105)
+  - properly handle toolchains defining `openmp` toolchain opt as `dict` (relevant for NVHPC toolchain) (#5093)
+  - enhance `get_source_tarball_from_git` to ensure that Git repo URL does not contain double slashes due to trailing slash in source URL (#5097)
+  - fix crash with `MarkupError` in Rich when showing failed shell command containing special characters (#5098)
+  - fix sub-toolchains of NVHPC and NVHPCToolchain and load each one where appropriate (#5103)
+  - don't require installation prefix for toolchain dependencies that are an external module (#5108)
+- enhancements:
+  - add support for injecting checksums for Rust crates (#4661)
+  - include full shell command that failed in raised error (#5074)
+  - improve error reporting for failures in `eb --merge-pr` and similar (#5076)
+  - add LLVM toolchains using ParaStationMPI (#5094)
+- enhancements and fixes for test suite:
+  - ignore output lines with skipped tests in check for unexpected output of test suite (#5082)
+  - import specific submodule `pygraph.classes.digraph` in `test_dep_graph*` so we can skip the test if import fails with setuptools >= 82.0.0 (#5111, #5116)
+- other changes:
+  - extend list of easyconfig parameters that extensions should not inherit: `sources`, `patches`, `checksums`, `skipsteps` (#5075)
+  - deprecate `print_error` function and replace it with new `print_error_and_exit` function (#5092)
+  - replace use of `datetime.utcfromtimestamp` which is deprecated since Python 3.12 (#5091)
+
 
 v5.2.0 (23 Dec 2025)
 --------------------

easybuild/__init__.py

@@ -1,5 +1,5 @@
 ##
-# Copyright 2011-2025 Ghent University
+# Copyright 2011-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

easybuild/base/exceptions.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2025 Ghent University
+# Copyright 2015-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

easybuild/base/fancylogger.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2025 Ghent University
+# Copyright 2011-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

easybuild/base/generaloption.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2025 Ghent University
+# Copyright 2011-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

easybuild/base/testing.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2025 Ghent University
+# Copyright 2014-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -210,6 +210,15 @@ def mocked_stdout(self):
         finally:
             self.mock_stdout(False)
 
+    @contextmanager
+    def mocked_stderr(self):
+        """Context manager to mock stdout"""
+        self.mock_stderr(True)
+        try:
+            yield sys.stderr
+        finally:
+            self.mock_stderr(False)
+
     @contextmanager
     def mocked_stdout_stderr(self, mock_stdout=True, mock_stderr=True):
         """Context manager to mock stdout and stderr"""

easybuild/framework/__init__.py

@@ -1,5 +1,5 @@
 ##
-# Copyright 2009-2025 Ghent University
+# Copyright 2009-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

easybuild/framework/easyblock.py

@@ -1,5 +1,5 @@
 # #
-# Copyright 2009-2025 Ghent University
+# Copyright 2009-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -81,7 +81,7 @@
 from easybuild.tools import LooseVersion, config
 from easybuild.tools.build_details import get_build_stats
 from easybuild.tools.build_log import EasyBuildError, EasyBuildExit, dry_run_msg, dry_run_warning, dry_run_set_dirs
-from easybuild.tools.build_log import print_error, print_msg, print_warning
+from easybuild.tools.build_log import print_error_and_exit, print_msg, print_warning
 from easybuild.tools.config import CHECKSUM_PRIORITY_JSON, DEFAULT_ENVVAR_USERS_MODULES
 from easybuild.tools.config import EASYBUILD_SOURCES_URL, EBPYTHONPREFIXES  # noqa
 from easybuild.tools.config import FORCE_DOWNLOAD_ALL, FORCE_DOWNLOAD_PATCHES, FORCE_DOWNLOAD_SOURCES
@@ -173,6 +173,14 @@ def extra_options(extra=None):
 
         return extra
 
+    @staticmethod
+    def src_parameter_names():
+        """
+        Return list of EasyConfig parameter that contribute to the sources in the `src` member
+        (or equivalently to the `sources` parameter of a parsed EasyConfig)
+        """
+        return ['sources']
+
     #
     # INIT
     #
@@ -1919,7 +1927,7 @@ def clean_up_fake_module(self, fake_mod_data):
         # self.short_mod_name might not be set (e.g. during unit tests)
         if fake_mod_path and self.short_mod_name is not None:
             try:
-                self.modules_tool.unload([self.short_mod_name], log_changes=False)
+                self.modules_tool.unload([self.short_mod_name], hide_output=True)
                 self.modules_tool.remove_module_path(os.path.join(fake_mod_path, self.mod_subdir))
                 remove_dir(os.path.dirname(fake_mod_path))
             except OSError as err:
@@ -2982,7 +2990,8 @@ def prepare_step(self, start_dir=True, load_tc_deps_modules=True):
             if os.path.isabs(self.rpath_wrappers_dir):
                 _log.info(f"Using {self.rpath_wrappers_dir} to store/use RPATH wrappers")
             else:
-                raise EasyBuildError(f"Path used for rpath_wrappers_dir is not an absolute path: {path}")
+                raise EasyBuildError("Path used for rpath_wrappers_dir is not an absolute path: %s",
+                                     self.rpath_wrappers_dir)
 
         if self.iter_idx > 0:
             # reset toolchain for iterative runs before preparing it again
@@ -4358,7 +4367,7 @@ def xs2str(xs):
 
         # allow oversubscription of P processes on C cores (P>C) for software installed on top of Open MPI;
         # this is useful to avoid failing of sanity check commands that involve MPI
-        if self.toolchain.mpi_family() and self.toolchain.mpi_family() in toolchain.OPENMPI:
+        if self.toolchain.mpi_family() and self.toolchain.mpi_family() == toolchain.OPENMPI:
             env.setvar('OMPI_MCA_rmaps_base_oversubscribe', '1')
 
         # run sanity checks from an empty temp directory
@@ -5066,8 +5075,8 @@ def build_and_install_one(ecdict, init_env):
         app = app_class(ecdict['ec'])
         _log.info("Obtained application instance for %s (easyblock: %s)" % (name, easyblock))
     except EasyBuildError as err:
-        print_error("Failed to get application instance for %s (easyblock: %s): %s" % (name, easyblock, err.msg),
-                    silent=silent)
+        print_error_and_exit("Failed to get application instance for %s (easyblock: %s): %s", name, easyblock, err.msg,
+                             silent=silent, exit_code=err.exit_code)
 
     # application settings
     stop = build_option('stop')
@@ -5603,8 +5612,8 @@ def make_checksum_lines(checksums, indent_level):
         if app.src:
             placeholder = '# PLACEHOLDER FOR SOURCES/PATCHES WITH CHECKSUMS'
 
-            # grab raw lines for source_urls, sources, data_sources, patches
-            keys = ['data_sources', 'patches', 'source_urls', 'sources']
+            # grab raw lines for the following params
+            keys = ['data_sources', 'source_urls'] + app.src_parameter_names() + ['patches']
             raw = {}
             for key in keys:
                 regex = re.compile(r'^(%s(?:.|\n)*?\])\s*$' % key, re.M)
@@ -5615,15 +5624,11 @@ def make_checksum_lines(checksums, indent_level):
 
             _log.debug("Raw lines for %s easyconfig parameters: %s", '/'.join(keys), raw)
 
-            # inject combination of source_urls/sources/patches/checksums into easyconfig
-            # by replacing first occurence of placeholder that was put in place
-            sources_raw = raw.get('sources', '')
-            data_sources_raw = raw.get('data_sources', '')
-            source_urls_raw = raw.get('source_urls', '')
-            patches_raw = raw.get('patches', '')
+            # inject combination of the grabbed lines and the checksums into the easyconfig
+            # by replacing first the occurence of the placeholder that was put in place
+            raw_text = ''.join(raw.get(key, '') for key in keys)
             regex = re.compile(placeholder + '\n', re.M)
-            ectxt = regex.sub(source_urls_raw + sources_raw + data_sources_raw + patches_raw + checksums_txt + '\n',
-                              ectxt, count=1)
+            ectxt = regex.sub(raw_text + checksums_txt + '\n', ectxt, count=1)
 
             # get rid of potential remaining placeholders
             ectxt = regex.sub('', ectxt)

easybuild/framework/easyconfig/__init__.py

@@ -1,5 +1,5 @@
 # #
-# Copyright 2009-2025 Ghent University
+# Copyright 2009-2026 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),