From 77ce1d62d8e40af04c5128a0fda8c7ad9630680a Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 29 Jan 2025 19:12:12 +0000 Subject: [PATCH 1/5] add MET v12.0.0 and METplus v6.0.0 --- var/spack/repos/builtin/packages/met/package.py | 1 + var/spack/repos/builtin/packages/metplus/package.py | 1 + 2 files changed, 2 insertions(+) diff --git a/var/spack/repos/builtin/packages/met/package.py b/var/spack/repos/builtin/packages/met/package.py index 776d4bc469e7a5..3fe2d2abf2d447 100644 --- a/var/spack/repos/builtin/packages/met/package.py +++ b/var/spack/repos/builtin/packages/met/package.py @@ -20,6 +20,7 @@ class Met(AutotoolsPackage): maintainers("AlexanderRichert-NOAA", "climbfuji") version("develop", branch="develop") + version("12.0.0", sha256="9a54275cfefbad6010d4449a8fa756ad40fae03fa62a766cbbfda170c422e5e4") version("11.1.1", sha256="d02f9281d46bc45c931ca233a51ce20ba2158c0dd26acac2cb76c5a68788022a") version("11.1.0", sha256="e2e371ae1f49185ff8bf08201b1a3e90864a467aa3369b04132d231213c3c9e5") version("11.0.2", sha256="f720d15e1d6c235c9a41fd97dbeb0eb1082fb8ae99e1bcdcb5e51be9b50bdfbf") diff --git a/var/spack/repos/builtin/packages/metplus/package.py b/var/spack/repos/builtin/packages/metplus/package.py index a12776b9e4f953..dea7c9c7c54685 100644 --- a/var/spack/repos/builtin/packages/metplus/package.py +++ b/var/spack/repos/builtin/packages/metplus/package.py @@ -19,6 +19,7 @@ class Metplus(Package): maintainers("AlexanderRichert-NOAA", "climbfuji") version("develop", branch="develop") + version("6.0.0", sha256="e9358aede2fd2abecd81806227de7b165d68fdf2fc9defcbba24df229461b155") version("5.1.0", sha256="e80df2d1059176a453b7991a9f123cb5a187cc7ba7f48a75313b92c7a0e68474") version("5.0.1", sha256="0e22b4f6791496551d99f68247d382b2af02c90b34c172a64c6f060e774bdced") version("5.0.0", sha256="59d519bd062559b4cece9f8672e2e282b200057bc77e2e0937414003d8f2dd50") From c7c61cd6416f21b9feaa81703f75a0ca58a0a1ba Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 29 Jan 2025 14:24:15 -0700 Subject: [PATCH 2/5] Set correct dependencies for metplus@6 in var/spack/repos/builtin/packages/metplus/package.py --- var/spack/repos/builtin/packages/metplus/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/var/spack/repos/builtin/packages/metplus/package.py b/var/spack/repos/builtin/packages/metplus/package.py index dea7c9c7c54685..76aebcb8eee351 100644 --- a/var/spack/repos/builtin/packages/metplus/package.py +++ b/var/spack/repos/builtin/packages/metplus/package.py @@ -35,10 +35,18 @@ class Metplus(Package): variant("makeplots", default=False, description="Enable MakePlots Wrapper.") variant("plotdataplane", default=False, description="Generate images from Postscript output.") + depends_on("python@3.10.4:", when="@6.0.0", type=("run")) + depends_on("met@12:+python", when="@6.0.0", type=("run")) depends_on("met+python", type=("run")) + # https://metplus.readthedocs.io/en/main_v6.0/Users_Guide/installation.html + depends_on("netcdf-c@1.5.4:", when="@6.0.0") + depends_on("netcdf-c") + depends_on("py-python-dateutil@2.8:", when="@6.0.0", type=("run")) depends_on("py-python-dateutil", type=("run")) + depends_on("py-cartopy@0.20.3:", when="@6.0.0 +makeplots", type=("run")) depends_on("py-cartopy", when="+makeplots", type=("run")) + depends_on("py-matplotlib@3.5.2", when="@6.0.0 +cycloneplotter", type=("run")) depends_on("py-matplotlib", when="+cycloneplotter", type=("run")) depends_on("py-cartopy", when="+cycloneplotter", type=("run")) From a0a212d1694759be48e51517d19e48a69598490a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 29 Jan 2025 16:13:03 -0700 Subject: [PATCH 3/5] Add missing dependency on proj for met@12 --- var/spack/repos/builtin/packages/met/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/met/package.py b/var/spack/repos/builtin/packages/met/package.py index 3fe2d2abf2d447..dfa616baa7c7db 100644 --- a/var/spack/repos/builtin/packages/met/package.py +++ b/var/spack/repos/builtin/packages/met/package.py @@ -44,6 +44,7 @@ class Met(AutotoolsPackage): depends_on("gsl") depends_on("bufr") + depends_on("proj", when="@12") depends_on("zlib-api") depends_on("netcdf-c") depends_on("netcdf-cxx4") From af17726e7ff34e5d7234dc43e7946b85a6f865ed Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 12 Feb 2025 14:57:49 -0700 Subject: [PATCH 4/5] Add met@12.0.1 --- var/spack/repos/builtin/packages/met/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/met/package.py b/var/spack/repos/builtin/packages/met/package.py index dfa616baa7c7db..3b2d3d34e881f1 100644 --- a/var/spack/repos/builtin/packages/met/package.py +++ b/var/spack/repos/builtin/packages/met/package.py @@ -20,6 +20,7 @@ class Met(AutotoolsPackage): maintainers("AlexanderRichert-NOAA", "climbfuji") version("develop", branch="develop") + version("12.0.1", sha256="ef396a99ca6c2248855848cd194f9ceaf3b051fb5e8c01a0b0b2a00110b1fcfb") version("12.0.0", sha256="9a54275cfefbad6010d4449a8fa756ad40fae03fa62a766cbbfda170c422e5e4") version("11.1.1", sha256="d02f9281d46bc45c931ca233a51ce20ba2158c0dd26acac2cb76c5a68788022a") version("11.1.0", sha256="e2e371ae1f49185ff8bf08201b1a3e90864a467aa3369b04132d231213c3c9e5") From 53c41fb20b44e5dad12d654b0d43e2f2bcebcb8b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 19 Feb 2025 17:59:26 -0700 Subject: [PATCH 5/5] Change @6.0.0 to @6: for requirements in var/spack/repos/builtin/packages/metplus/package.py --- var/spack/repos/builtin/packages/metplus/package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/metplus/package.py b/var/spack/repos/builtin/packages/metplus/package.py index 76aebcb8eee351..b8354891415c15 100644 --- a/var/spack/repos/builtin/packages/metplus/package.py +++ b/var/spack/repos/builtin/packages/metplus/package.py @@ -35,18 +35,18 @@ class Metplus(Package): variant("makeplots", default=False, description="Enable MakePlots Wrapper.") variant("plotdataplane", default=False, description="Generate images from Postscript output.") - depends_on("python@3.10.4:", when="@6.0.0", type=("run")) - depends_on("met@12:+python", when="@6.0.0", type=("run")) + depends_on("python@3.10.4:", when="@6:", type=("run")) + depends_on("met@12:+python", when="@6:", type=("run")) depends_on("met+python", type=("run")) # https://metplus.readthedocs.io/en/main_v6.0/Users_Guide/installation.html - depends_on("netcdf-c@1.5.4:", when="@6.0.0") + depends_on("netcdf-c@1.5.4:", when="@6:") depends_on("netcdf-c") - depends_on("py-python-dateutil@2.8:", when="@6.0.0", type=("run")) + depends_on("py-python-dateutil@2.8:", when="@6:", type=("run")) depends_on("py-python-dateutil", type=("run")) - depends_on("py-cartopy@0.20.3:", when="@6.0.0 +makeplots", type=("run")) + depends_on("py-cartopy@0.20.3:", when="@6: +makeplots", type=("run")) depends_on("py-cartopy", when="+makeplots", type=("run")) - depends_on("py-matplotlib@3.5.2", when="@6.0.0 +cycloneplotter", type=("run")) + depends_on("py-matplotlib@3.5.2", when="@6: +cycloneplotter", type=("run")) depends_on("py-matplotlib", when="+cycloneplotter", type=("run")) depends_on("py-cartopy", when="+cycloneplotter", type=("run"))