py-bbp-workflow: bump, update xarray from upstream

BlueBrain · Aug 29, 2023 · 06d8fe4 · 06d8fe4
1 parent 1c3d52e
commit 06d8fe4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git 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/bluebrain/repo-bluebrain/packages/py-entity-management/package.py b/bluebrain/repo-bluebrain/packages/py-entity-management/package.py
@@ -12,7 +12,7 @@ class PyEntityManagement(PythonPackage):
     homepage = "https://bbpgitlab.epfl.ch/nse/entity-management"
     git = "ssh://git@bbpgitlab.epfl.ch/nse/entity-management.git"
 
-    version("1.2.24", tag="entity-management-v1.2.24")
+    version("1.2.25", tag="entity-management-v1.2.25")
     version("1.2.19", tag="entity-management-v1.2.19")
 
     depends_on("py-setuptools", type="build")

diff --git 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"))