From 8f40889a465f933fa7de67a240a0bfb1abccb7fe Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Fri, 18 Apr 2025 02:29:31 -0400 Subject: [PATCH] mapl: add v2.55.0 (#50068) --- .../repos/builtin/packages/mapl/package.py | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/mapl/package.py b/var/spack/repos/builtin/packages/mapl/package.py index 974d36db93d..6251e5a13d4 100644 --- a/var/spack/repos/builtin/packages/mapl/package.py +++ b/var/spack/repos/builtin/packages/mapl/package.py @@ -37,6 +37,7 @@ class Mapl(CMakePackage): version("develop", branch="develop") version("main", branch="main") + version("2.55.0", sha256="13ec3d81d53cf18aa18322b74b9a6990ad7e51224f1156be5d1f834ee826f95c") version("2.54.2", sha256="70b7be425d07a7be7d9bb0e53b93a372887a048caf23260e0ae602ca6e3670ed") version("2.54.1", sha256="2430ded45a98989e9100037f54cf22f5a5083e17196514b3667d3003413e49e1") version("2.53.2", sha256="0f294a5289541b0028773f8e5ab2bf04734ec09241baa5a3dcea0e939d40336f") @@ -162,11 +163,17 @@ class Mapl(CMakePackage): # Versions later than 3.14 remove FindESMF.cmake # from ESMA_CMake. + resource( + name="esma_cmake", + git="https://github.com/GEOS-ESM/ESMA_cmake.git", + tag="v3.58.1", + when="@2.55:", + ) resource( name="esma_cmake", git="https://github.com/GEOS-ESM/ESMA_cmake.git", tag="v3.55.0", - when="@2.51:", + when="@2.51:2.54", ) resource( name="esma_cmake", @@ -304,14 +311,16 @@ class Mapl(CMakePackage): depends_on("udunits", when="@2.48:") # gFTL dependency - depends_on("gftl@1.14.0:", when="@2.48:") + depends_on("gftl@1.15.2:", when="@2.55:") + depends_on("gftl@1.14.0:", when="@2.48:2.54") depends_on("gftl@1.13.0:", when="@2.45:2.47") depends_on("gftl@1.11.0:", when="@2.44") depends_on("gftl@1.10.0:", when="@2.40:2.43") depends_on("gftl@1.5.5:1.9", when="@:2.39") # gFTL-Shared dependency - depends_on("gftl-shared@1.9.0:", when="@2.48:") + depends_on("gftl-shared@1.10.0:", when="@2.55:") + depends_on("gftl-shared@1.9.0:", when="@2.48:2.54") depends_on("gftl-shared@1.8.0:", when="@2.45:2.47") depends_on("gftl-shared@1.7.0:", when="@2.44") depends_on("gftl-shared@1.6.1:", when="@2.40:2.43") @@ -325,7 +334,8 @@ class Mapl(CMakePackage): depends_on("yafyaml@1.0-beta5", when="@:2.22+extdata2g") # pflogger dependency - depends_on("pflogger@1.15.0: +mpi", when="@2.48:+pflogger") + depends_on("pflogger@1.16.1: +mpi", when="@2.55:+pflogger") + depends_on("pflogger@1.15.0: +mpi", when="@2.48:2.54+pflogger") depends_on("pflogger@1.14.0: +mpi", when="@2.45:2.47+pflogger") depends_on("pflogger@1.11.0: +mpi", when="@2.44+pflogger") depends_on("pflogger@1.9.5: +mpi", when="@2.40:2.43+pflogger") @@ -333,14 +343,16 @@ class Mapl(CMakePackage): depends_on("pflogger@:1.6 +mpi", when="@:2.22+pflogger") # fargparse dependency - depends_on("fargparse@1.8.0:", when="@2.48:+fargparse") + depends_on("fargparse@1.9.0:", when="@2.55:+fargparse") + depends_on("fargparse@1.8.0:", when="@2.48:2.54+fargparse") depends_on("fargparse@1.7.0:", when="@2.45:2.47+fargparse") depends_on("fargparse@1.6.0:", when="@2.44+fargparse") depends_on("fargparse@1.5.0:", when="@2.40:43+fargparse") depends_on("fargparse@1.4.1:1.4", when="@:2.39+fargparse") # pfunit dependency - depends_on("pfunit@4.10: +mpi +fhamcrest", when="@2.48:+pfunit") + depends_on("pfunit@4.11.1: +mpi +fhamcrest", when="@2.55:+pfunit") + depends_on("pfunit@4.10: +mpi +fhamcrest", when="@2.48:2.54+pfunit") depends_on("pfunit@4.9: +mpi +fhamcrest", when="@2.45:2.47+pfunit") depends_on("pfunit@4.8: +mpi +fhamcrest", when="@2.44+pfunit") depends_on("pfunit@4.7.3: +mpi +fhamcrest", when="@2.40:+pfunit")