From c60dffaea75b72a03a753511cc6ae3ac3e792e9f Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Sun, 9 Oct 2022 18:38:54 +0200 Subject: py-cdo: add version 1.5.6, deprecate 1.3.2 (#32793) * py-cdo: add version 1.5.6 * py-cdo: make python run depdendencies also the build ones * py-cdo: restrict Python version --- var/spack/repos/builtin/packages/py-cdo/package.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py index 5e94b61091..d7df0d0e7c 100644 --- a/var/spack/repos/builtin/packages/py-cdo/package.py +++ b/var/spack/repos/builtin/packages/py-cdo/package.py @@ -12,10 +12,23 @@ class PyCdo(PythonPackage): pypi = "cdo/cdo-1.3.2.tar.gz" - version("1.3.2", sha256="9f78879d90d14134f2320565016d0d371b7dfe7ec71110fd313868ec1db34aee") + maintainers = ["Try2Code", "skosukhin"] - depends_on("cdo") + version("1.5.6", sha256="fec1a75382f01b3c9c368e8f143d98b12323e06975663f87d9b60c739ae1d335") + version( + "1.3.2", + sha256="9f78879d90d14134f2320565016d0d371b7dfe7ec71110fd313868ec1db34aee", + deprecated=True, + ) + + depends_on("python@2.7:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-scipy", type=("build", "run")) + depends_on("cdo+netcdf", type="run") depends_on("py-netcdf4", type=("build", "run")) + depends_on("py-scipy", type=("build", "run"), when="@:1.4") + depends_on("py-xarray", type=("build", "run"), when="@1.3.4:") + depends_on("py-six", type=("build", "run"), when="@1.3.3:") + + def setup_run_environment(self, env): + env.set("CDO", self.spec["cdo"].prefix.bin.cdo) -- cgit v1.2.3-70-g09d2