py-scikit-image: add v0.20.0 (#36167)

* py-scikit-image: add v0.20.0

* [@spackbot] updating style on behalf of adamjstewart

---------

Co-authored-by: adamjstewart <adamjstewart@users.noreply.github.com>

5 files changed, 73 insertions, 29 deletions

diff --git a/var/spack/repos/builtin/packages/py-lazy-loader/package.py b/var/spack/repos/builtin/packages/py-lazy-loader/package.py
new file mode 100644
index 0000000000..5836be0335
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-lazy-loader/package.py
@@ -0,0 +1,17 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyLazyLoader(PythonPackage):
+    """lazy_loader makes it easy to load subpackages and functions on demand."""
+
+    homepage = "https://scientific-python.org/specs/spec-0001/"
+    pypi = "lazy_loader/lazy_loader-0.1.tar.gz"
+
+    version("0.1", sha256="77ce7f2737ebabf9c0ff73b4a99c947876d74d24c2f026544e32246ecca5feca")
+
+    depends_on("py-flit-core@3.7:3", type="build")
diff --git a/var/spack/repos/builtin/packages/py-meson-python/package.py b/var/spack/repos/builtin/packages/py-meson-python/package.py
index 15a978a46e..0b1a2f4ae1 100644
--- a/var/spack/repos/builtin/packages/py-meson-python/package.py
+++ b/var/spack/repos/builtin/packages/py-meson-python/package.py
@@ -14,6 +14,10 @@ class PyMesonPython(PythonPackage):
 
     maintainers("eli-schwartz", "adamjstewart", "rgommers")
 
+    # Needed for py-scikit-image, deprecate and remove once 0.13.0 is officially released
+    version(
+        "0.13.0.pre0", sha256="8d537a0304709c31c11ffa34872a62a4c06a6a6c24fc862b7fb4306f3e881b95"
+    )
     version("0.12.0", sha256="8cb159a8093a2e73cfa897f8092ec93b74e3842f94dff7fde381c6fe0e0b064d")
     version("0.11.0", sha256="110258837c2ffe762f5f855c7ea5385f1edd44074e93a0f317ffefc7aab42b09")
     version("0.10.0", sha256="08dd122c1074dbd5c55b53993a719cca73dd8216372c91217f7a550260f9e7e1")
@@ -22,10 +26,10 @@ class PyMesonPython(PythonPackage):
     version("0.8.0", sha256="b5c8a2727e6f6feaffc1db513244c9bdb5d0f689b45e24f4529b649b7710daf7")
     version("0.7.0", sha256="9fcfa350f44ca80dd4f5f9c3d251725434acf9a07d9618f382e6cc4629dcbe84")
 
-    depends_on("python@3.7:", type=("build", "run"))
     depends_on("meson@0.63.3:", when="@0.11:", type=("build", "run"))
     depends_on("meson@0.63:", when="@0.9:0.10", type=("build", "run"))
     depends_on("meson@0.62:", type=("build", "run"))
+    depends_on("py-pyproject-metadata@0.7.1:", when="@0.13:", type=("build", "run"))
     depends_on("py-pyproject-metadata@0.6.1:", when="@0.12:", type=("build", "run"))
     depends_on("py-pyproject-metadata@0.5:", type=("build", "run"))
     depends_on("py-tomli@1:", when="@0.11: ^python@:3.10", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py b/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py
index 99c1243333..f901c46eae 100644
--- a/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py
+++ b/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py
@@ -12,8 +12,8 @@ class PyPyprojectMetadata(PythonPackage):
     homepage = "https://github.com/FFY00/python-pyproject-metadata"
     pypi = "pyproject-metadata/pyproject-metadata-0.6.1.tar.gz"
 
+    version("0.7.1", sha256="0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67")
     version("0.6.1", sha256="b5fb09543a64a91165dfe85796759f9e415edc296beb4db33d1ecf7866a862bd")
 
-    depends_on("python@3.7:", type=("build", "run"))
     depends_on("py-setuptools@42:", type="build")
     depends_on("py-packaging@19:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py
index 89a7fdceea..1e09993711 100644
--- a/var/spack/repos/builtin/packages/py-scikit-image/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py
@@ -11,9 +11,10 @@ class PyScikitImage(PythonPackage):
     filtering, warping, color manipulation, object detection, etc."""
 
     homepage = "https://scikit-image.org/"
-    pypi = "scikit-image/scikit-image-0.17.2.tar.gz"
+    pypi = "scikit-image/scikit_image-0.17.2.tar.gz"
     git = "https://github.com/scikit-image/scikit-image.git"
 
+    version("0.20.0", sha256="2cd784fce18bd31d71ade62c6221440199ead03acf7544086261ee032264cf61")
     version("0.19.3", sha256="24b5367de1762da6ee126dd8f30cc4e7efda474e0d7d70685433f0e3aa2ec450")
     version("0.18.3", sha256="ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca")
     version("0.18.1", sha256="fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171")
@@ -21,43 +22,33 @@ class PyScikitImage(PythonPackage):
     version("0.14.2", sha256="1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f")
     version("0.12.3", sha256="82da192f0e524701e89c5379c79200bc6dc21373f48bf7778a864c583897d7c7")
 
-    extends("python", ignore=r"bin/.*\.py$")
+    # Get dependencies for:
+    #
+    # @0.20:      from pyproject.toml
+    # @0.18:0.19  from requirements/build.txt, requirements/default.txt, pyproject.toml
+    # @0.14:0.17  from requirements/build.txt, requirements/default.txt
+    # @:0.13      from requirements.txt, DEPENDS.txt
 
-    # get dependencies for
-    # @:0.13.1 from requirements.txt, DEPENDS.txt
-    # @0.14: from requirements/build.txt, requirements/default.txt
-    # @0.18: from requirements/build.txt, requirements/default.txt, pyproject.toml
-    depends_on("python@3.7:", when="@0.18:", type=("build", "link", "run"))
-    depends_on("python@3.6:", when="@0.16:", type=("build", "link", "run"))
-    depends_on("python@2.7:", when="@0.13:", type=("build", "link", "run"))
-    depends_on("python@2.6:", type=("build", "link", "run"))
-    depends_on("py-setuptools@:59.4", when="@0.19.1:", type="build")
-    depends_on("py-setuptools@51:", when="@0.18:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-cython@0.29.24:2", when="@0.19:", type="build")
-    depends_on("py-cython@0.29.21:", when="@0.18:", type="build")  # from build.txt
-    depends_on("py-cython@0.29.13:", when="@0.17:", type="build")
-    depends_on("py-cython@0.25:0.28.1,0.28.3:0.28,0.29.1:", when="@0.15:", type="build")
-    depends_on("py-cython@0.23.4:0.28.1,0.28.3:0.28,0.29.1:", when="@0.14.3:0.14", type="build")
-    depends_on("py-cython@0.23.4:0.28.1", when="@0.14.2", type="build")
-    depends_on("py-cython@0.23.4:", when="@0.14.1", type="build")
-    depends_on("py-cython@0.21:", type="build")
-    depends_on("py-pythran", when="@0.19:", type="build")
+    depends_on("python@3.8:", when="@0.20:", type=("build", "link", "run"))
 
-    depends_on("py-numpy@1.17,1.18.1:", when="@0.19:", type=("build", "link", "run"))
+    depends_on("py-numpy@1.21.1:", when="@0.20:", type=("build", "link", "run"))
+    depends_on("py-numpy@1.17,1.18.1:", when="@0.19", type=("build", "link", "run"))
     depends_on("py-numpy@1.16.5:1.17,1.18.1:", when="@0.18", type=("build", "link", "run"))
-    depends_on("py-numpy@1.15.1:1.17,1.18.1:", when="@0.17.0:0.17", type=("build", "link", "run"))
-    depends_on("py-numpy@1.14.1:", when="@0.16:", type=("build", "link", "run"))
-    depends_on("py-numpy@1.11:", when="@0.13:", type=("build", "link", "run"))
-    depends_on("py-numpy@1.7.2:", type=("build", "run"))
+    depends_on("py-numpy@1.15.1:1.17,1.18.1:", when="@0.17", type=("build", "link", "run"))
+    depends_on("py-numpy@1.14.1:", when="@0.16", type=("build", "link", "run"))
+    depends_on("py-numpy@1.11:", when="@0.13:0.15", type=("build", "link", "run"))
+    depends_on("py-numpy@1.7.2:", when="@:0.12", type=("build", "run"))
+    depends_on("py-scipy@1.8:", when="@0.20:", type=("build", "run"))
     depends_on("py-scipy@1.4.1:", when="@0.19:", type=("build", "run"))
     depends_on("py-scipy@1.0.1:", when="@0.17:", type=("build", "run"))
     depends_on("py-scipy@0.19:", when="@0.16:", type=("build", "run"))
     depends_on("py-scipy@0.17:", when="@0.13:", type=("build", "run"))
     depends_on("py-scipy@0.9:", type=("build", "run"))
+    depends_on("py-networkx@2.8:", when="@0.20:", type=("build", "run"))
     depends_on("py-networkx@2.2:", when="@0.19:", type=("build", "run"))
     depends_on("py-networkx@2:", when="@0.15:", type=("build", "run"))
     depends_on("py-networkx@1.8:", type=("build", "run"))
+    depends_on("pil@9.0.1:", when="@0.20:", type=("build", "run"))
     depends_on("pil@6.1:7.0,7.1.2:8.2,8.3.1:", when="@0.19:", type=("build", "run"))
     depends_on("pil@4.3:7.0,7.1.2:", when="@0.17:", type=("build", "run"))
     depends_on("pil@4.3:", when="@0.14:", type=("build", "run"))
@@ -69,6 +60,23 @@ class PyScikitImage(PythonPackage):
     depends_on("py-pywavelets@1.1.1:", when="@0.17:", type=("build", "run"))
     depends_on("py-pywavelets@0.4:", when="@0.13:", type=("build", "run"))
     depends_on("py-packaging@20:", when="@0.19:", type=("build", "run"))
+    depends_on("py-lazy-loader@0.1:", when="@0.20:", type=("build", "run"))
+
+    depends_on("py-meson-python@0.13:", when="@0.20:", type="build")
+    depends_on("py-setuptools@67:", when="@0.20:", type="build")
+    depends_on("py-setuptools@:59.4", when="@0.19.1:0.19", type="build")
+    depends_on("py-setuptools@51:", when="@0.18:", type="build")
+    depends_on("py-setuptools", type="build")
+    depends_on("py-cython@0.29.24:", when="@0.20:", type="build")
+    depends_on("py-cython@0.29.24:2", when="@0.19", type="build")
+    depends_on("py-cython@0.29.21:", when="@0.18", type="build")
+    depends_on("py-cython@0.29.13:", when="@0.17", type="build")
+    depends_on("py-cython@0.25:0.28.1,0.28.3:0.28,0.29.1:", when="@0.15:0.16", type="build")
+    depends_on("py-cython@0.23.4:0.28.1,0.28.3:0.28,0.29.1:", when="@0.14.3:0.14", type="build")
+    depends_on("py-cython@0.23.4:0.28.1", when="@0.14.2", type="build")
+    depends_on("py-cython@0.23.4:", when="@0.14.1", type="build")
+    depends_on("py-cython@0.21:", when="@0.12", type="build")
+    depends_on("py-pythran", when="@0.19:", type="build")
 
     # dependencies for old versions
     depends_on("py-numpydoc@0.6:", when="@0.13.0:0.13", type="build")
@@ -82,3 +90,13 @@ class PyScikitImage(PythonPackage):
     depends_on("py-dask+array@0.9:", when="@0.14.0:0.14.1", type=("build", "run"))
     depends_on("py-dask+array@0.5:", when="@:0.13", type=("build", "run"))
     depends_on("py-cloudpickle@0.2.1:", when="@0.14.0:0.14", type=("build", "run"))
+
+    def url_for_version(self, version):
+        url = (
+            "https://files.pythonhosted.org/packages/source/s/scikit-image/scikit{}image-{}.tar.gz"
+        )
+        if version >= Version("0.20"):
+            sep = "_"
+        else:
+            sep = "-"
+        return url.format(sep, version)
diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py
index a3c56a6171..6fa0fee5cd 100644
--- a/var/spack/repos/builtin/packages/py-setuptools/package.py
+++ b/var/spack/repos/builtin/packages/py-setuptools/package.py
@@ -15,6 +15,11 @@ class PySetuptools(Package, PythonExtension):
     list_url = "https://pypi.org/simple/setuptools/"
 
     version(
+        "67.6.0",
+        sha256="b78aaa36f6b90a074c1fa651168723acbf45d14cb1196b6f02c0fd07f17623b2",
+        expand=False,
+    )
+    version(
         "65.5.0",
         sha256="f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356",
         expand=False,