From 9a6a1ecfa99909644ada269d67a87758042f1c2d Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jan 2024 12:36:48 -0600 Subject: [PATCH 1/5] Fix file renaming for 2.4.0.1. --- .../repos/builtin/packages/crtm-fix/package.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/crtm-fix/package.py b/var/spack/repos/builtin/packages/crtm-fix/package.py index 7c30f6aebd34dd..d6d0fb0f87a8d9 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -58,21 +58,27 @@ def install(self, spec, prefix): # Little_Endian amsua_metop-c_v2.SpcCoeff.bin is what it's supposed to be. # Remove the incorrect file, and install it as noACC,, then install # correct file under new name. - if "+big_endian" in spec and spec.version == Version("2.4.0_emc"): - remove_path = join_path( - os.getcwd(), "fix", "SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin" - ) + if "+big_endian" in spec and spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]: + amc_sc_path = join_path("SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin") + amc_sc_v2_path = join_path("SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin") + # In 2.4.0_emc, the path is prefixed by 'fix/' + if spec.version == Version("2.4.0_emc"): + amc_sc_path = join_path("fix", amc_sc_path) + amc_sc_v2_path = join_path("fix", amc_sc_v2_path) + + remove_path = join_path(os.getcwd(), amc_sc_path) + fix_files.remove(remove_path) # This file is incorrect, install it as a different name. install( - join_path("fix", "SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin"), + amc_sc_path, join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.noACC.bin"), ) # This "Little_Endian" file is actually the correct one. install( - join_path("fix", "SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin"), + amc_sc_v2_path, join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.bin"), ) From 0db0f4304a3bca09737837caec7d90c4c9298ca1 Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jan 2024 13:13:37 -0600 Subject: [PATCH 2/5] Fix formatting of crtm-fix package.py. --- var/spack/repos/builtin/packages/crtm-fix/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/crtm-fix/package.py b/var/spack/repos/builtin/packages/crtm-fix/package.py index d6d0fb0f87a8d9..78fcb123505238 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -58,9 +58,11 @@ def install(self, spec, prefix): # Little_Endian amsua_metop-c_v2.SpcCoeff.bin is what it's supposed to be. # Remove the incorrect file, and install it as noACC,, then install # correct file under new name. - if "+big_endian" in spec and spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]: + if "+big_endian" in spec and spec.version in [Version("2.4.0_emc"),Version("2.4.0.1_emc")]: amc_sc_path = join_path("SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin") - amc_sc_v2_path = join_path("SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin") + amc_sc_v2_path = join_path( + "SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin" + ) # In 2.4.0_emc, the path is prefixed by 'fix/' if spec.version == Version("2.4.0_emc"): amc_sc_path = join_path("fix", amc_sc_path) From a89baf506afc09cac804b83d1786b7cca938e3e1 Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jan 2024 13:19:52 -0600 Subject: [PATCH 3/5] Fix crtm-fix package.py formatting (again). --- var/spack/repos/builtin/packages/crtm-fix/package.py | 3 ++- 1 file changed, 2 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 78fcb123505238..dcc7cee57776a4 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -58,7 +58,8 @@ def install(self, spec, prefix): # Little_Endian amsua_metop-c_v2.SpcCoeff.bin is what it's supposed to be. # Remove the incorrect file, and install it as noACC,, then install # correct file under new name. - if "+big_endian" in spec and spec.version in [Version("2.4.0_emc"),Version("2.4.0.1_emc")]: + if "+big_endian" in spec and ( + spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]): amc_sc_path = join_path("SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin") amc_sc_v2_path = join_path( "SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin" From ae787c5a7a3f49d2fa1c1dd0bc92060e80ec84ab Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jan 2024 13:23:33 -0600 Subject: [PATCH 4/5] One more attempt at fixing formatting. --- var/spack/repos/builtin/packages/crtm-fix/package.py | 2 +- 1 file changed, 1 insertion(+), 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 dcc7cee57776a4..f0dde04403452d 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -59,7 +59,7 @@ def install(self, spec, prefix): # Remove the incorrect file, and install it as noACC,, then install # correct file under new name. if "+big_endian" in spec and ( - spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]): + spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]): amc_sc_path = join_path("SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin") amc_sc_v2_path = join_path( "SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin" From 6eb02faf4616fcb5fa2c78e103a23b5ef441c6a9 Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jan 2024 13:50:55 -0600 Subject: [PATCH 5/5] Fixed formatting with black. --- .../repos/builtin/packages/crtm-fix/package.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/crtm-fix/package.py b/var/spack/repos/builtin/packages/crtm-fix/package.py index f0dde04403452d..2499c2e047fb2a 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -59,7 +59,8 @@ def install(self, spec, prefix): # Remove the incorrect file, and install it as noACC,, then install # correct file under new name. if "+big_endian" in spec and ( - spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")]): + spec.version in [Version("2.4.0_emc"), Version("2.4.0.1_emc")] + ): amc_sc_path = join_path("SpcCoeff", "Big_Endian", "amsua_metop-c.SpcCoeff.bin") amc_sc_v2_path = join_path( "SpcCoeff", "Little_Endian", "amsua_metop-c_v2.SpcCoeff.bin" @@ -74,16 +75,10 @@ def install(self, spec, prefix): fix_files.remove(remove_path) # This file is incorrect, install it as a different name. - install( - amc_sc_path, - join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.noACC.bin"), - ) + install(amc_sc_path, join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.noACC.bin")) # This "Little_Endian" file is actually the correct one. - install( - amc_sc_v2_path, - join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.bin"), - ) + install(amc_sc_v2_path, join_path(self.prefix.fix, "amsua_metop-c.SpcCoeff.bin")) for f in fix_files: install(f, self.prefix.fix)