From ad14a9d4a7c4389e4d278f8ebab0613f046f4af0 Mon Sep 17 00:00:00 2001 From: genrich Date: Mon, 28 Aug 2023 16:41:22 +0200 Subject: [PATCH] py-bbp-workflow: bump, update xarray from upstream --- .../repo-bluebrain/packages/py-bbp-workflow/package.py | 8 ++++---- var/spack/repos/builtin/packages/py-xarray/package.py | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bluebrain/repo-bluebrain/packages/py-bbp-workflow/package.py b/bluebrain/repo-bluebrain/packages/py-bbp-workflow/package.py index 453f75b43abd61..e40373d4a28e75 100644 --- a/bluebrain/repo-bluebrain/packages/py-bbp-workflow/package.py +++ b/bluebrain/repo-bluebrain/packages/py-bbp-workflow/package.py @@ -12,13 +12,13 @@ class PyBbpWorkflow(PythonPackage): homepage = "https://bbpgitlab.epfl.ch/nse/bbp-workflow" git = "ssh://git@bbpgitlab.epfl.ch/nse/bbp-workflow.git" - version("3.1.32.dev2", tag="bbp-workflow-v3.1.32.dev2") + version("3.1.32.dev3", tag="bbp-workflow-v3.1.32.dev3") depends_on("py-setuptools", type=("build")) depends_on("py-requests-unixsocket", type="run") - depends_on("py-dask+diagnostics@2021.6.2", type="run") - depends_on("py-distributed@2021.6.2", type="run") + depends_on("py-dask+diagnostics", type="run") + depends_on("py-distributed", type="run") depends_on("py-luigi", type="run") depends_on("py-jsonschema", type="run") depends_on("py-luigi-tools", type="run") @@ -29,7 +29,7 @@ class PyBbpWorkflow(PythonPackage): depends_on("py-bluepysnap", type="run") depends_on("py-voxcell", type="run") depends_on("py-entity-management", type="run") - depends_on("py-xarray@0.18.2", type="run") + depends_on("py-xarray", type="run") depends_on("py-pint-xarray", type="run") depends_on("py-cheetah3", type="run") depends_on("py-elephant", type="run") diff --git a/var/spack/repos/builtin/packages/py-xarray/package.py b/var/spack/repos/builtin/packages/py-xarray/package.py index db104235cfbbcc..ceebb19ea3d7a9 100644 --- a/var/spack/repos/builtin/packages/py-xarray/package.py +++ b/var/spack/repos/builtin/packages/py-xarray/package.py @@ -42,8 +42,9 @@ class PyXarray(PythonPackage): depends_on("py-setuptools@38.4:", when="@0.16:", type=("build", "run")) depends_on("py-setuptools@42:", when="@0.17:", type=("build", "run")) depends_on("py-setuptools-scm", when="@0.15:", type="build") - depends_on("py-setuptools-scm@3.4:+toml", when="@0.17:", type="build") - depends_on("py-setuptools-scm-git-archive", when="@0.17:", type="build") + depends_on("py-setuptools-scm@7:", when="@2023.7.0:", type="build") + depends_on("py-setuptools-scm@3.4:+toml", when="@0.17:2022.3.0", type="build") + depends_on("py-setuptools-scm-git-archive", when="@0.17:2022.3.0", type="build") # setup.cfg depends_on("python@2.7,3.5:", when="@0.11:", type=("build", "run")) @@ -76,7 +77,7 @@ class PyXarray(PythonPackage): depends_on("py-netcdf4", when="+io", type=("build", "run")) depends_on("py-h5netcdf", when="+io", type=("build", "run")) depends_on("py-scipy", when="+io", type=("build", "run")) - depends_on("py-pydap", when="+io", type=("build", "run")) + depends_on("py-pydap", when="+io ^python@:3.9", type=("build", "run")) depends_on("py-zarr", when="+io", type=("build", "run")) depends_on("py-fsspec", when="+io", type=("build", "run")) depends_on("py-cftime", when="+io", type=("build", "run"))