From 53a756d04597bc0cae905bbed67ab91b419d4d5a Mon Sep 17 00:00:00 2001 From: genric Date: Mon, 22 May 2023 21:29:23 +0200 Subject: py-dask: add v2023.4.1 (#37550) * py-dask: add v2023.4.1 * address review comments --- var/spack/repos/builtin/packages/py-dask/package.py | 17 ++++++++++++++++- .../repos/builtin/packages/py-distributed/package.py | 16 ++++++++++++++-- var/spack/repos/builtin/packages/py-partd/package.py | 2 ++ var/spack/repos/builtin/packages/py-zict/package.py | 5 ++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index 3aa2deee7d..274f457c82 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -14,6 +14,7 @@ class PyDask(PythonPackage): maintainers("skosukhin") + version("2023.4.1", sha256="9dc72ebb509f58f3fe518c12dd5a488c67123fdd66ccb0b968b34fd11e512153") version("2022.10.2", sha256="42cb43f601709575fa46ce09e74bea83fdd464187024f56954e09d9b428ceaab") version("2021.6.2", sha256="8588fcd1a42224b7cfcd2ebc8ad616734abb6b1a4517efd52d89c7dd66eb91f8") version("2021.4.1", sha256="195e4eeb154222ea7a1c368119b5f321ee4ec9d78531471fe0145a527f744aa8") @@ -75,16 +76,24 @@ class PyDask(PythonPackage): depends_on("python@3.8:", type=("build", "run"), when="@2022.10.2:") depends_on("py-setuptools", type="build") + depends_on("py-setuptools@62.6:", type="build", when="@2023.4.1:") + depends_on("py-versioneer@0.28+toml", type="build", when="@2023.4.1:") # Common requirements depends_on("py-packaging@20:", type="build", when="@2022.10.2:") depends_on("py-pyyaml", type=("build", "run"), when="@2.17.1:") depends_on("py-pyyaml@5.3.1:", type=("build", "run"), when="@2022.10.2:") depends_on("py-cloudpickle@1.1.1:", type=("build", "run"), when="@2021.3.1:") + depends_on("py-cloudpickle@1.5.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-fsspec@0.6.0:", type=("build", "run"), when="@2021.3.1:") + depends_on("py-fsspec@2021.09.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2021.3.1:") + depends_on("py-toolz@0.10.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-partd@0.3.10:", type=("build", "run"), when="@2021.3.1:") + depends_on("py-partd@1.2.0:", type=("build", "run"), when="@2023.4.0:") depends_on("py-click@7.0:", type=("build", "run"), when="@2022.10.2:") + depends_on("py-click@8.0:", type=("build", "run"), when="@2023.4.1:") + depends_on("py-importlib-metadata@4.13.0:", type=("build", "run"), when="@2023.4.0:") # Requirements for dask.array depends_on("py-numpy", type=("build", "run"), when="@:0.17.1 +array") @@ -94,6 +103,7 @@ class PyDask(PythonPackage): depends_on("py-numpy@1.15.1:", type=("build", "run"), when="@2020.12.0: +array") depends_on("py-numpy@1.16.0:", type=("build", "run"), when="@2021.3.1: +array") depends_on("py-numpy@1.18.0:", type=("build", "run"), when="@2022.10.2: +array") + depends_on("py-numpy@1.21.0:", type=("build", "run"), when="@2023.4.0: +array") depends_on("py-toolz", type=("build", "run"), when="@:0.6.1 +array") depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +array") @@ -136,6 +146,7 @@ class PyDask(PythonPackage): depends_on("py-numpy@1.15.1:", type=("build", "run"), when="@2020.12.0: +dataframe") depends_on("py-numpy@1.16.0:", type=("build", "run"), when="@2021.3.1: +dataframe") depends_on("py-numpy@1.18.0:", type=("build", "run"), when="@2022.10.2: +dataframe") + depends_on("py-numpy@1.21.0:", type=("build", "run"), when="@2023.4.0: +dataframe") depends_on("py-pandas@0.16.0:", type=("build", "run"), when="+dataframe") depends_on("py-pandas@0.18.0:", type=("build", "run"), when="@0.9.0: +dataframe") @@ -144,6 +155,7 @@ class PyDask(PythonPackage): depends_on("py-pandas@0.23.0:", type=("build", "run"), when="@2.11.0: +dataframe") depends_on("py-pandas@0.25.0:", type=("build", "run"), when="@2020.12.0: +dataframe") depends_on("py-pandas@1.0:", type=("build", "run"), when="@2022.10.2: +dataframe") + depends_on("py-pandas@1.3:", type=("build", "run"), when="@2023.4.0: +dataframe") depends_on("py-toolz", type=("build", "run"), when="@:0.6.1 +dataframe") depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +dataframe") @@ -193,12 +205,15 @@ class PyDask(PythonPackage): ) depends_on("py-distributed@2021.6.2", type=("build", "run"), when="@2021.6.2 +distributed") depends_on("py-distributed@2022.10.2", type=("build", "run"), when="@2022.10.2 +distributed") + depends_on("py-distributed@2023.4.1", type=("build", "run"), when="@2023.4.1 +distributed") # Requirements for dask.diagnostics depends_on("py-bokeh@1.0.0:", type=("build", "run"), when="@2.0.0: +diagnostics") depends_on("py-bokeh@1.0.0:1,2.0.1:", type=("build", "run"), when="@2.26.0: +diagnostics") - depends_on("py-bokeh@2.4.2:2", type=("build", "run"), when="@2022.10.2: +diagnostics") + depends_on("py-bokeh@2.4.2:2", type=("build", "run"), when="@2022.10.2:2023.3 +diagnostics") + depends_on("py-bokeh@2.4.2:", type=("build", "run"), when="@2023.4.0: +diagnostics") depends_on("py-jinja2", type=("build", "run"), when="@2022.10.2: +diagnostics") + depends_on("py-jinja2@2.10.3", type=("build", "run"), when="@2023.4.0: +diagnostics") # Requirements for dask.delayed depends_on("py-cloudpickle@0.2.1:", type=("build", "run"), when="@2.7.0: +delayed") diff --git a/var/spack/repos/builtin/packages/py-distributed/package.py b/var/spack/repos/builtin/packages/py-distributed/package.py index 65b7c9f4b2..77cfbea627 100644 --- a/var/spack/repos/builtin/packages/py-distributed/package.py +++ b/var/spack/repos/builtin/packages/py-distributed/package.py @@ -30,6 +30,7 @@ class PyDistributed(PythonPackage): "distributed.diagnostics", ] + version("2023.4.1", sha256="0140376338efdcf8db1d03f7c1fdbb5eab2a337b03e955d927c116824ee94ac5") version("2022.10.2", sha256="53f0a5bf6efab9a5ab3345cd913f6d3f3d4ea444ee2edbea331c7fef96fd67d0") version("2022.2.1", sha256="fb62a75af8ef33bbe1aa80a68c01a33a93c1cd5a332dd017ab44955bf7ecf65b") version("2021.6.2", sha256="d7d112a86ab049dcefa3b21fd1baea4212a2c03d22c24bd55ad38d21a7f5d148") @@ -50,22 +51,29 @@ class PyDistributed(PythonPackage): depends_on("python@3.6:", when="@2:", type=("build", "run")) depends_on("python@3.7:", when="@2021.4.1:", type=("build", "run")) depends_on("python@3.8:", when="@2022.2.1:", type=("build", "run")) - depends_on("py-setuptools", type=("build", "run")) + depends_on("py-setuptools", type="build") + depends_on("py-setuptools@62.6:", type="build", when="@2023.4.1:") + depends_on("py-versioneer@0.28+toml", type="build", when="@2023.4.1:") # In Spack py-dask+distributed depends on py-distributed, not the other way around. # Hence, no need for depends_on("py-dask", ...) depends_on("py-click@6.6:", type=("build", "run")) + depends_on("py-click@8.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-cloudpickle@0.2.2:", type=("build", "run"), when="@:2.16.0") depends_on("py-cloudpickle@1.3.0:", type=("build", "run"), when="@2.17.0:2.20.0") depends_on("py-cloudpickle@1.5.0:", type=("build", "run"), when="@2.21.0:") depends_on("py-jinja2", type=("build", "run"), when="@2022.2.1:") + depends_on("py-jinja2@2.10.3", type=("build", "run"), when="@2023.4.1:") depends_on("py-locket@1:", type=("build", "run"), when="@2022.2.1:") depends_on("py-msgpack", type=("build", "run"), when="@:2.10.0") depends_on("py-msgpack@0.6.0:", type=("build", "run"), when="@2.11.0:") + depends_on("py-msgpack@1.0.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-packaging@20.0:", type=("build", "run"), when="@2022.2.1:") depends_on("py-psutil@5.0:", type=("build", "run")) + depends_on("py-psutil@5.7.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-six", type=("build", "run"), when="@:1") depends_on("py-sortedcontainers@:1,2.0.2:", type=("build", "run")) + depends_on("py-sortedcontainers@2.0.5:", type=("build", "run"), when="@2023.4.1:") depends_on("py-tblib", type=("build", "run"), when="@:2.10.0") depends_on("py-tblib@1.6.0:", type=("build", "run"), when="@2.11.0:") depends_on("py-toolz@0.7.4:", type=("build", "run"), when="@:2.12.0") @@ -77,8 +85,12 @@ class PyDistributed(PythonPackage): depends_on("py-tornado@6.0.3:", type=("build", "run"), when="^python@3.8:") depends_on("py-tornado@6.0.3:6.1", type=("build", "run"), when="@2022.10.2:") depends_on("py-zict@0.1.3:", type=("build", "run")) + depends_on("py-zict@2.2.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-pyyaml", type=("build", "run")) + depends_on("py-pyyaml@5.3.1:", type=("build", "run"), when="@2023.4.1:") depends_on("py-urllib3", type=("build", "run"), when="@2022.10.2:") + depends_on("py-urllib3@1.24.3:", type=("build", "run"), when="@2023.4.1:") def patch(self): - filter_file("^dask .*", "", "requirements.txt") + if self.spec.satisfies("@:2023.3"): + filter_file("^dask .*", "", "requirements.txt") diff --git a/var/spack/repos/builtin/packages/py-partd/package.py b/var/spack/repos/builtin/packages/py-partd/package.py index 34abb61903..eabd00084e 100644 --- a/var/spack/repos/builtin/packages/py-partd/package.py +++ b/var/spack/repos/builtin/packages/py-partd/package.py @@ -12,11 +12,13 @@ class PyPartd(PythonPackage): homepage = "https://github.com/dask/partd/" pypi = "partd/partd-0.3.8.tar.gz" + version("1.4.0", sha256="aa0ff35dbbcc807ae374db56332f4c1b39b46f67bf2975f5151e0b4186aed0d5") version("1.1.0", sha256="6e258bf0810701407ad1410d63d1a15cfd7b773fd9efe555dac6bb82cc8832b0") version("0.3.10", sha256="33722a228ebcd1fa6f44b1631bdd4cff056376f89eb826d7d880b35b637bcfba") version("0.3.8", sha256="67291f1c4827cde3e0148b3be5d69af64b6d6169feb9ba88f0a6cfe77089400f") depends_on("python@3.5:", type=("build", "run"), when="@1.1.0:") + depends_on("python@3.7:", type=("build", "run"), when="@1.4.0:") depends_on("py-setuptools", type="build") depends_on("py-locket", type=("build", "run")) depends_on("py-toolz", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-zict/package.py b/var/spack/repos/builtin/packages/py-zict/package.py index 513bfac094..b6ee6d5fb7 100644 --- a/var/spack/repos/builtin/packages/py-zict/package.py +++ b/var/spack/repos/builtin/packages/py-zict/package.py @@ -12,7 +12,10 @@ class PyZict(PythonPackage): homepage = "https://zict.readthedocs.io/en/latest/" pypi = "zict/zict-1.0.0.tar.gz" + version("3.0.0", sha256="e321e263b6a97aafc0790c3cfb3c04656b7066e6738c37fffcca95d803c9fba5") version("1.0.0", sha256="e34dd25ea97def518fb4c77f2c27078f3a7d6c965b0a3ac8fe5bdb0a8011a310") + depends_on("python@3.8:", when="@3.0.0:", type=("build", "run")) + depends_on("py-setuptools", type="build") - depends_on("py-heapdict", type=("build", "run")) + depends_on("py-heapdict", type=("build", "run"), when="@:2.2.0") -- cgit v1.2.3-60-g2f50