From 44cf8b0d271cffea7ba7c70e5ea7770ecfc00b65 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 16 Aug 2024 12:47:38 -0600 Subject: [PATCH] Add 'py-dask +delayed' to gmao-swell-env and add comments in that package and in py-xnrl about the +delayed variant (#1246) Add 'py-dask +delayed' to gmao-swell-env (so that it is in the unified environment, as requested by GMAO originally) and add comments in that package and in py-xnrl about the +delayed variant. Because this variant affects which versions of py-dask can be used, we should modify both packages at the same time. At the moment, we still need the +delayed variant in py-xnrl. --- .../spack-stack/packages/gmao-swell-env/package.py | 11 +++++++---- .../repos/spack-stack/packages/py-xnrl/package.py | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py index 28b73d67f..092fe668e 100644 --- a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py +++ b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py @@ -45,10 +45,13 @@ class GmaoSwellEnv(BundlePackage): 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") + depends_on("py-pycodestyle", type="run") + depends_on("py-pyyaml", type="run") + # Note that the +delayed option is for compatibility + # with the py-xnrl package (this restricts py-dask + # to certain versions, since the newest versions + # don't have that option anymore. + depends_on("py-dask +delayed", type="run") # Future dependencies needed # depends_on("py-bokeh", type="run") diff --git a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py index 8f620efea..add77b186 100644 --- a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py +++ b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py @@ -27,6 +27,8 @@ class PyXnrl(PythonPackage): depends_on("py-poetry", type="build") depends_on("py-metpy", type=("build", "run")) + # Note: if the +delayed option is removed, also + # need to remove it from gmao-swell-env. depends_on("py-dask +delayed", type=("build", "run")) depends_on("py-h5netcdf", type=("build", "run")) depends_on("py-netcdf4", type=("build", "run"))