From f0aa84c219ecb44022cf72e9c1df9175d53f0b2b Mon Sep 17 00:00:00 2001 From: danholdaway Date: Mon, 2 Oct 2023 21:42:09 -0400 Subject: [PATCH 1/4] Add swell environment file --- .../packages/gmao-swell-env/package.py | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py diff --git a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py new file mode 100644 index 00000000000000..390ddfb4e7f580 --- /dev/null +++ b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py @@ -0,0 +1,65 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class GmaoSwellEnv(BundlePackage): + """Development environment for swell""" + + homepage = "https://geos-esm.github.io/swell/" + git = "https://github.com/GEOS-ESM/swell" + + maintainers("climbfuji", "danholdaway", "mathomp4") + + # Current version + version("1.0.0") + + # Main JEDI modules + depends_on("jedi-base-env +python", type="run") + + # Jedi interfaces to build + depends_on("jedi-fv3-env", type="run") + depends_on("soca-env", type="run") + + # GEOS + # depends_on("geos-dev-env", type="run") # We should have the modules needed to build GEOSgcm + + # Python packages for swell, eva, and other utilities + depends_on("py-cartopy", type="run") + depends_on("py-click", type="run") + depends_on("py-contourpy", type="run") + depends_on("py-gitpython", type="run") + depends_on("py-jinja2", type="run") + depends_on("py-matplotlib", type="run") + depends_on("py-numpy", type="run") + depends_on("py-pip", type="run") + depends_on("py-pkgconfig", type="run") + depends_on("py-requests", type="run") + depends_on("py-urllib3", type="run") + depends_on("py-wheel", type="run") + depends_on("py-setuptools", type="run") + + # Different versions than other bundles + depends_on("py-pycodestyle@2.10:", type="run") + depends_on("py-pyyaml@6:", type="run") + + # Future dependencies needed + # depends_on("py-bokeh", type="run") + # depends_on("py-cylc-flow", type="run") + # depends_on("py-cylc-uiserver", type="run") + # depends_on("py-flake8", type="run") + # depends_on("py-hvplot", type="run") + # depends_on("py-holoviews", type="run") + # depends_on("py-isodate", type="run") + # depends_on("py-questionary", type="run") + # depends_on("py-scikit-learn", type="run") + + conflicts( + "%gcc platform=darwin", + msg="ewok-env does " + "not build with gcc (11?) on macOS (12), use apple-clang", + ) + + # There is no need for install() since there is no code. From cd13552d497cb99e6611141e230c6cb87a75cfba Mon Sep 17 00:00:00 2001 From: danholdaway Date: Mon, 2 Oct 2023 21:50:00 -0400 Subject: [PATCH 2/4] seaborn --- .../repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py index 390ddfb4e7f580..08bddb1db95d70 100644 --- a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py +++ b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py @@ -56,6 +56,7 @@ class GmaoSwellEnv(BundlePackage): # depends_on("py-isodate", type="run") # depends_on("py-questionary", type="run") # depends_on("py-scikit-learn", type="run") + # depends_on("py-seaborn", type="run") conflicts( "%gcc platform=darwin", From 7e97336477ca4d981018348c8365104548d1f692 Mon Sep 17 00:00:00 2001 From: danholdaway Date: Tue, 3 Oct 2023 09:02:03 -0400 Subject: [PATCH 3/4] ewok->swell in conflicts line --- .../repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py index 08bddb1db95d70..9e9f80152c88c7 100644 --- a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py +++ b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py @@ -60,7 +60,7 @@ class GmaoSwellEnv(BundlePackage): conflicts( "%gcc platform=darwin", - msg="ewok-env does " + "not build with gcc (11?) on macOS (12), use apple-clang", + msg="gmao-swell-env does " + "not build with gcc (11?) on macOS (12), use apple-clang", ) # There is no need for install() since there is no code. From d086982621c16db553510a02c92c5df1c70bc2fe Mon Sep 17 00:00:00 2001 From: danholdaway Date: Tue, 3 Oct 2023 10:55:46 -0400 Subject: [PATCH 4/4] add crtm 2.4.0 --- .../jcsda-emc-bundles/packages/gmao-swell-env/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py index 9e9f80152c88c7..5b3a65cae4cf44 100644 --- a/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py +++ b/var/spack/repos/jcsda-emc-bundles/packages/gmao-swell-env/package.py @@ -20,7 +20,10 @@ class GmaoSwellEnv(BundlePackage): # Main JEDI modules depends_on("jedi-base-env +python", type="run") - # Jedi interfaces to build + # Add CRTM 2.4.0 + depends_on("crtm@v2.4-jedi.2", type="run") + + # JEDI interfaces used by swell depends_on("jedi-fv3-env", type="run") depends_on("soca-env", type="run")