From 5cfc27c0a01af5c74c612dfc8d3e9ec51e8c9292 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 6 Mar 2025 23:41:51 +0100 Subject: [PATCH 1/2] use .tar.xz for archived of git repos in Cargo easyblock --- easybuild/easyblocks/generic/cargo.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/easybuild/easyblocks/generic/cargo.py b/easybuild/easyblocks/generic/cargo.py index 9c50973a6df..5996718e0c0 100755 --- a/easybuild/easyblocks/generic/cargo.py +++ b/easybuild/easyblocks/generic/cargo.py @@ -164,12 +164,17 @@ def extra_options(extra_vars=None): return extra_vars @staticmethod - def crate_src_filename(pkg_name, pkg_version, _=None, rev=None, _branch=None): + def crate_src_filename(pkg_name, pkg_version, _url=None, rev=None, _branch=None): """Crate tarball filename based on package name, version and optionally git revision""" - parts = [pkg_name, pkg_version] + filename = [pkg_name, pkg_version] + filename_ext = '.tar.gz' + if rev is not None: - parts.append(rev) - return '-'.join(parts) + ".tar.gz" + # sources from a git repo + filename.append(rev[:8]) # append short commit hash + filename_ext = '.tar.xz' # use a reproducible archive format + + return f"{'-'.join(filename)}{filename_ext}" @staticmethod def crate_download_filename(pkg_name, pkg_version): From cf188b4792990a76fd3501ae2c42474624609038 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 7 Mar 2025 10:10:54 +0100 Subject: [PATCH 2/2] Remove f-string --- easybuild/easyblocks/generic/cargo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyblocks/generic/cargo.py b/easybuild/easyblocks/generic/cargo.py index 5996718e0c0..579b342fdeb 100755 --- a/easybuild/easyblocks/generic/cargo.py +++ b/easybuild/easyblocks/generic/cargo.py @@ -174,7 +174,7 @@ def crate_src_filename(pkg_name, pkg_version, _url=None, rev=None, _branch=None) filename.append(rev[:8]) # append short commit hash filename_ext = '.tar.xz' # use a reproducible archive format - return f"{'-'.join(filename)}{filename_ext}" + return '-'.join(filename) + filename_ext @staticmethod def crate_download_filename(pkg_name, pkg_version):