Skip to content

Commit

Permalink
Add 'py-dask +delayed' to gmao-swell-env and add comments in that pac…
Browse files Browse the repository at this point in the history
…kage 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.
  • Loading branch information
climbfuji authored Aug 16, 2024
1 parent fb8b0fd commit 44cf8b0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 7 additions & 4 deletions spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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("[email protected]:", 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")
Expand Down
2 changes: 2 additions & 0 deletions spack-ext/repos/spack-stack/packages/py-xnrl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down

0 comments on commit 44cf8b0

Please sign in to comment.