From e9d8c5767b4306e86637ef2783469604a409605e Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 19 Feb 2025 20:13:08 -0800 Subject: [PATCH] crtm-fix: 3.1.1.2 (#48755) * crtm-fix: 3.1.1.2 * correct checksum * exclude test files * Update package.py --- var/spack/repos/builtin/packages/crtm-fix/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/crtm-fix/package.py b/var/spack/repos/builtin/packages/crtm-fix/package.py index 9a69119ac8a..6a19bcc7b8f 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -17,6 +17,7 @@ class CrtmFix(Package): "BenjaminTJohnson", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "climbfuji" ) + version("3.1.1.2", sha256="c2e289f690d82a3aa82d2239cbb567cd514fa0f476a8b498ceba11670685ca66") version( "2.4.0.1_emc", sha256="6e4005b780435c8e280d6bfa23808d8f12609dfd72f77717d046d4795cac0457" ) @@ -26,6 +27,7 @@ class CrtmFix(Package): variant("big_endian", default=True, description="Install big_endian fix files") variant("little_endian", default=False, description="Install little endian fix files") variant("netcdf", default=True, description="Install netcdf fix files") + variant("testfiles", default=False, description="Install test files", when="@3:") conflicts("+big_endian", when="+little_endian", msg="big_endian and little_endian conflict") @@ -51,7 +53,11 @@ def install(self, spec, prefix): fix_files = [] for d in endian_dirs: - fix_files = fix_files + find(".", "*/{}/*".format(d)) + fix_files = fix_files + find(".", "*/{}/*".format(d), recursive=False) + fix_files = fix_files + find(".", "*/*/{}/*".format(d), recursive=False) + if self.spec.satisfies("~testfiles"): + fix_files = [f for f in fix_files if "/fix/test_data/" not in f] + fix_files = [f for f in fix_files if os.path.isfile(f)] # Big_Endian amsua_metop-c.SpcCoeff.bin is incorrect # Little_Endian amsua_metop-c_v2.SpcCoeff.bin is what it's supposed to be.