Update dask and related packages (#33925)

* Update dask and related packages

* Update package dependency specs

* Run spack style

* Add new version of locket

* Respond to comments

* Added constraints

* Add version constraints for py-dask+distributed

* Run spack style

* Update var/spack/repos/builtin/packages/py-dask/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Deprecated dask versions

* Deprecated more dask and distirbuted

* spack style --fix

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

5 files changed, 84 insertions, 19 deletions

diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py
index 5e117ceb10..6b97e2ba83 100644
--- a/var/spack/repos/builtin/packages/py-dask/package.py
+++ b/var/spack/repos/builtin/packages/py-dask/package.py
@@ -14,15 +14,40 @@ class PyDask(PythonPackage):
 
     maintainers = ["skosukhin"]
 
+    version("2022.10.2", sha256="42cb43f601709575fa46ce09e74bea83fdd464187024f56954e09d9b428ceaab")
     version("2021.6.2", sha256="8588fcd1a42224b7cfcd2ebc8ad616734abb6b1a4517efd52d89c7dd66eb91f8")
     version("2021.4.1", sha256="195e4eeb154222ea7a1c368119b5f321ee4ec9d78531471fe0145a527f744aa8")
     version("2020.12.0", sha256="43e745afd4b464e6c0113131e430a16dce6ac42460b06e24d799093d098f7ab0")
-    version("2.16.0", sha256="2af5b0dcd48ce679ce0321cf91de623f4fe376262789b951fefa3c334002f350")
-    version("1.2.2", sha256="5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c")
-    version("1.1.2", sha256="93b355b9a9c9a3ddbb39fab99d5759aad5cfd346f4520b87788970e80cf97256")
-    version("1.1.0", sha256="e76088e8931b326c05a92d2658e07b94a6852b42c13a7560505a8b2354871454")
-    version("0.17.4", sha256="c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d")
-    version("0.8.1", sha256="43deb1934cd033668e5e60b735f45c9c3ee2813f87bd51c243f975e55267fa43")
+    version(
+        "2.16.0",
+        sha256="2af5b0dcd48ce679ce0321cf91de623f4fe376262789b951fefa3c334002f350",
+        deprecated=True,
+    )
+    version(
+        "1.2.2",
+        sha256="5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c",
+        deprecated=True,
+    )
+    version(
+        "1.1.2",
+        sha256="93b355b9a9c9a3ddbb39fab99d5759aad5cfd346f4520b87788970e80cf97256",
+        deprecated=True,
+    )
+    version(
+        "1.1.0",
+        sha256="e76088e8931b326c05a92d2658e07b94a6852b42c13a7560505a8b2354871454",
+        deprecated=True,
+    )
+    version(
+        "0.17.4",
+        sha256="c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d",
+        deprecated=True,
+    )
+    version(
+        "0.8.1",
+        sha256="43deb1934cd033668e5e60b735f45c9c3ee2813f87bd51c243f975e55267fa43",
+        deprecated=True,
+    )
 
     variant("array", default=True, description="Install requirements for dask.array")
     variant("bag", default=True, description="Install requirements for dask.bag")
@@ -47,15 +72,19 @@ class PyDask(PythonPackage):
     depends_on("python@3.5:", type=("build", "run"), when="@2.0.0:")
     depends_on("python@3.6:", type=("build", "run"), when="@2.7.0:")
     depends_on("python@3.7:", type=("build", "run"), when="@2021.3.1:")
+    depends_on("python@3.8:", type=("build", "run"), when="@2022.10.2:")
 
     depends_on("py-setuptools", type="build")
 
     # 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-fsspec@0.6.0:", type=("build", "run"), when="@2021.3.1:")
     depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2021.3.1:")
     depends_on("py-partd@0.3.10:", type=("build", "run"), when="@2021.3.1:")
+    depends_on("py-click@7.0:", type=("build", "run"), when="@2022.10.2:")
 
     # Requirements for dask.array
     depends_on("py-numpy", type=("build", "run"), when="@:0.17.1 +array")
@@ -64,6 +93,7 @@ class PyDask(PythonPackage):
     depends_on("py-numpy@1.13.0:", type=("build", "run"), when="@1.2.1: +array")
     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-toolz", type=("build", "run"), when="@:0.6.1 +array")
     depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +array")
@@ -105,6 +135,7 @@ class PyDask(PythonPackage):
     depends_on("py-numpy@1.13.0:", type=("build", "run"), when="@1.2.1: +dataframe")
     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-pandas@0.16.0:", type=("build", "run"), when="+dataframe")
     depends_on("py-pandas@0.18.0:", type=("build", "run"), when="@0.9.0: +dataframe")
@@ -112,6 +143,7 @@ class PyDask(PythonPackage):
     depends_on("py-pandas@0.21.0:", type=("build", "run"), when="@1.2.1: +dataframe")
     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-toolz", type=("build", "run"), when="@:0.6.1 +dataframe")
     depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +dataframe")
@@ -138,24 +170,35 @@ class PyDask(PythonPackage):
     # Requirements for dask.distributed
     depends_on("py-dill", type=("build", "run"), when="@:0.7.5 +distributed")
     depends_on("py-pyzmq", type=("build", "run"), when="@:0.7.5 +distributed")
-    depends_on("py-distributed@:2021.8.0", type=("build", "run"), when="@0.8.2: +distributed")
-    depends_on("py-distributed@1.9:2021.8.0", type=("build", "run"), when="@0.9.0: +distributed")
-    depends_on("py-distributed@1.10:2021.8.0", type=("build", "run"), when="@0.10.0: +distributed")
-    depends_on("py-distributed@1.14:2021.8.0", type=("build", "run"), when="@0.12.0: +distributed")
-    depends_on("py-distributed@1.15:2021.8.0", type=("build", "run"), when="@0.13.0: +distributed")
-    depends_on("py-distributed@1.16:2021.8.0", type=("build", "run"), when="@0.14.1: +distributed")
-    depends_on("py-distributed@1.20:2021.8.0", type=("build", "run"), when="@0.16.0: +distributed")
-    depends_on("py-distributed@1.21:2021.8.0", type=("build", "run"), when="@0.17.0: +distributed")
-    depends_on("py-distributed@1.22:2021.8.0", type=("build", "run"), when="@0.18.0: +distributed")
-    depends_on("py-distributed@2.0:2021.8.0", type=("build", "run"), when="@2.0.0: +distributed")
+    depends_on("py-distributed@:2021.8.0", type=("build", "run"), when="@0.8.2:0.8 +distributed")
+    depends_on("py-distributed@1.9:2021.8.0", type=("build", "run"), when="@0.9 +distributed")
+    depends_on("py-distributed@1.10:2021.8.0", type=("build", "run"), when="@0.10 +distributed")
+    depends_on("py-distributed@1.14:2021.8.0", type=("build", "run"), when="@0.12 +distributed")
+    depends_on("py-distributed@1.15:2021.8.0", type=("build", "run"), when="@0.13 +distributed")
+    depends_on(
+        "py-distributed@1.16:2021.8.0", type=("build", "run"), when="@0.14.1:0.14 +distributed"
+    )
+    depends_on("py-distributed@1.20:2021.8.0", type=("build", "run"), when="@0.16 +distributed")
+    depends_on("py-distributed@1.21:2021.8.0", type=("build", "run"), when="@0.17 +distributed")
+    depends_on(
+        "py-distributed@1.22:2021.8.0", type=("build", "run"), when="@0.18.0:1 +distributed"
+    )
+    depends_on(
+        "py-distributed@2.0:2021.8.0", type=("build", "run"), when="@2.0.0:2020.11 +distributed"
+    )
     depends_on(
-        "py-distributed@2020.12.0:2021.8.0", type=("build", "run"), when="@2020.12.0: +distributed"
+        "py-distributed@2020.12.0:2021.8.0",
+        type=("build", "run"),
+        when="@2020.12.0:2021.6.1 +distributed",
     )
     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")
 
     # 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-jinja2", type=("build", "run"), when="@2022.10.2: +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 fcf15e3a1a..f1e2b436f1 100644
--- a/var/spack/repos/builtin/packages/py-distributed/package.py
+++ b/var/spack/repos/builtin/packages/py-distributed/package.py
@@ -30,12 +30,21 @@ class PyDistributed(PythonPackage):
         "distributed.diagnostics",
     ]
 
+    version("2022.10.2", sha256="53f0a5bf6efab9a5ab3345cd913f6d3f3d4ea444ee2edbea331c7fef96fd67d0")
     version("2022.2.1", sha256="fb62a75af8ef33bbe1aa80a68c01a33a93c1cd5a332dd017ab44955bf7ecf65b")
     version("2021.6.2", sha256="d7d112a86ab049dcefa3b21fd1baea4212a2c03d22c24bd55ad38d21a7f5d148")
     version("2021.4.1", sha256="4c1b189ec5aeaf770c473f730f4a3660dc655601abd22899e8a0662303662168")
     version("2020.12.0", sha256="2a0b6acc921cd4e0143a7c4383cdcbed7defbc4bd9dc3aab0c7f1c45f14f80e1")
-    version("2.10.0", sha256="2f8cca741a20f776929cbad3545f2df64cf60207fb21f774ef24aad6f6589e8b")
-    version("1.28.1", sha256="3bd83f8b7eb5938af5f2be91ccff8984630713f36f8f66097e531a63f141c48a")
+    version(
+        "2.10.0",
+        sha256="2f8cca741a20f776929cbad3545f2df64cf60207fb21f774ef24aad6f6589e8b",
+        deprecated=True,
+    )
+    version(
+        "1.28.1",
+        sha256="3bd83f8b7eb5938af5f2be91ccff8984630713f36f8f66097e531a63f141c48a",
+        deprecated=True,
+    )
 
     depends_on("python@2.7:2.8,3.5:", when="@:1", type=("build", "run"))
     depends_on("python@3.6:", when="@2:", type=("build", "run"))
@@ -43,11 +52,14 @@ class PyDistributed(PythonPackage):
     depends_on("python@3.8:", when="@2022.2.1:", type=("build", "run"))
     depends_on("py-setuptools", type=("build", "run"))
 
+    # 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-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-locket@1:", type=("build", "run"), when="@2022.2.1:")
     depends_on("py-contextvars", type=("build", "run"), when="@2020: ^python@:3.6")
     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:")
@@ -59,12 +71,17 @@ class PyDistributed(PythonPackage):
     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")
     depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2.13.0:")
+    # Note that the setup.py is wrong for py-toolz, when="@2022.10.2".
+    # See https://github.com/dask/distributed/pull/7309
+    depends_on("py-toolz@0.10.0:", type=("build", "run"), when="@2022.10.2:")
     depends_on("py-tornado@5:", type=("build", "run"), when="^python@:3.7")
     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-pyyaml", type=("build", "run"))
     depends_on("py-futures", when="@:1 ^python@2.7:2.8", type=("build", "run"))
     depends_on("py-singledispatch", when="@:1 ^python@2.7:2.8", type=("build", "run"))
+    depends_on("py-urllib3", type=("build", "run"), when="@2022.10.2:")
 
     def patch(self):
         filter_file("^dask .*", "", "requirements.txt")
diff --git a/var/spack/repos/builtin/packages/py-fsspec/package.py b/var/spack/repos/builtin/packages/py-fsspec/package.py
index d215e9eeb3..2d22c9a31c 100644
--- a/var/spack/repos/builtin/packages/py-fsspec/package.py
+++ b/var/spack/repos/builtin/packages/py-fsspec/package.py
@@ -12,6 +12,7 @@ class PyFsspec(PythonPackage):
     homepage = "https://github.com/intake/filesystem_spec"
     pypi = "fsspec/fsspec-0.4.4.tar.gz"
 
+    version("2022.11.0", sha256="259d5fd5c8e756ff2ea72f42e7613c32667dc2049a4ac3d84364a7ca034acb8b")
     version("2021.7.0", sha256="792ebd3b54de0b30f1ce73f0ba0a8bcc864724f2d9f248cb8d0ece47db0cbde8")
     version("2021.4.0", sha256="8b1a69884855d1a8c038574292e8b861894c3373282d9a469697a2b41d5289a6")
     version("0.9.0", sha256="3f7a62547e425b0b336a6ac2c2e6c6ac824648725bc8391af84bb510a63d1a56")
@@ -25,6 +26,7 @@ class PyFsspec(PythonPackage):
 
     depends_on("python@3.5:", type=("build", "run"))
     depends_on("python@3.6:", type=("build", "run"), when="@0.6.3:")
+    depends_on("python@3.7:", type=("build", "run"), when="@2022.11.0:")
     depends_on("py-setuptools", type="build")
     depends_on("py-requests", type=("build", "run"), when="+http")
     depends_on("py-aiohttp", type=("build", "run"), when="+http")
diff --git a/var/spack/repos/builtin/packages/py-locket/package.py b/var/spack/repos/builtin/packages/py-locket/package.py
index baf28eaa96..8336e8de88 100644
--- a/var/spack/repos/builtin/packages/py-locket/package.py
+++ b/var/spack/repos/builtin/packages/py-locket/package.py
@@ -12,6 +12,7 @@ class PyLocket(PythonPackage):
     homepage = "https://github.com/mwilliamson/locket.py"
     pypi = "locket/locket-0.2.0.tar.gz"
 
+    version("1.0.0", sha256="5c0d4c052a8bbbf750e056a8e65ccd309086f4f0f18a2eac306a8dfa4112a632")
     version("0.2.0", sha256="1fee63c1153db602b50154684f5725564e63a0f6d09366a1cb13dffcec179fb4")
 
     # pip silently replaces distutils with setuptools
diff --git a/var/spack/repos/builtin/packages/py-toolz/package.py b/var/spack/repos/builtin/packages/py-toolz/package.py
index c01f79d607..197f6cabd5 100644
--- a/var/spack/repos/builtin/packages/py-toolz/package.py
+++ b/var/spack/repos/builtin/packages/py-toolz/package.py
@@ -12,6 +12,8 @@ class PyToolz(PythonPackage):
     homepage = "https://github.com/pytoolz/toolz/"
     pypi = "toolz/toolz-0.9.0.tar.gz"
 
+    version("0.12.0", sha256="88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194")
     version("0.9.0", sha256="929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9")
 
     depends_on("py-setuptools", type="build")
+    depends_on("python@3.5:", type=("build", "run"), when="@0.11.0:")