py-cleo: add versions 2.0.0 2.0.1; add maintainers (#40611)

* py-cleo: add versions 2.0.0 2.0.1; add maintainers

* py-cleo: add forgotten dependence

* py-cleo: update from review: remove preferred version, remove a dependence, fix py-rapidfuzz version

* py-cleo: deprecated version 1.0.0a5; add version 1.0.0; update dependences

* py-cleo: add version 2.1.0; update version range of dependences

* py-crashtest: add version 0.4.1, dependence of py-cleo

* py-cleo: update dependence

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

* py-cleo: update dependence py-clikit

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

* py-cleo: update dependence py-rapidfuzz

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

* py-rapidfuzz: add version 2.2.0 dependence of py-cleo@2

* py-cleo: fix version range of py-crashtest

* py-rapidfuzz: fix dependences; add py-rapidfuzz-capi and py-jarowinkler

---------

Co-authored-by: LydDeb <lyderic.debusschere@eolen.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

5 files changed, 66 insertions, 9 deletions

diff --git a/var/spack/repos/builtin/packages/py-cleo/package.py b/var/spack/repos/builtin/packages/py-cleo/package.py
index 1852bd7b3e..b5d60f1adc 100644
--- a/var/spack/repos/builtin/packages/py-cleo/package.py
+++ b/var/spack/repos/builtin/packages/py-cleo/package.py
@@ -12,17 +12,26 @@ class PyCleo(PythonPackage):
     homepage = "https://github.com/sdispater/cleo"
     pypi = "cleo/cleo-0.8.1.tar.gz"
 
-    version("1.0.0a5", sha256="097c9d0e0332fd53cc89fc11eb0a6ba0309e6a3933c08f7b38558555486925d3")
+    maintainers("LydDeb")
+
+    version("2.1.0", sha256="0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523")
+    version("2.0.1", sha256="eb4b2e1f3063c11085cebe489a6e9124163c226575a3c3be69b2e51af4a15ec5")
+    version("2.0.0", sha256="fbc5cb141cbc31ea8ffd3d5cd67d3b183fa38aa5098fd37e39e9a953a232fda9")
+    version("1.0.0", sha256="bb5e4f70db83a597575ec86a1ed8fc56bd80934cfea3db97a23ea50c03b78382")
     version(
-        "0.8.1",
-        sha256="3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f",
-        preferred=True,
+        "1.0.0a5",
+        sha256="097c9d0e0332fd53cc89fc11eb0a6ba0309e6a3933c08f7b38558555486925d3",
+        deprecated=True,
     )
+    version("0.8.1", sha256="3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f")
 
     depends_on("python@2.7,3.4:3", type=("build", "run"))
     depends_on("python@3.7:3", when="@1:", type=("build", "run"))
     depends_on("py-poetry-core@1:", type="build")
-    depends_on("py-poetry-core@1", when="@1:", type="build")
-    depends_on("py-clikit@0.6.0:0.6", when="@0.8.1", type=("build", "run"))
-    depends_on("py-pylev@1.3:1", when="@1:", type=("build", "run"))
-    depends_on("py-crashtest@0.3.1:0.3", when="@1:", type=("build", "run"))
+    depends_on("py-poetry-core@1.1:1", when="@1:2.0.0", type="build")
+    depends_on("py-poetry-core@1.1.0:", when="@2.0.1:", type="build")
+    depends_on("py-clikit@0.6", when="@0.8.1", type=("build", "run"))
+    depends_on("py-pylev@1.3:1", when="@1.0.0a5", type=("build", "run"))
+    depends_on("py-crashtest@0.4.1:0.4", when="@1:", type=("build", "run"))
+    depends_on("py-rapidfuzz@2.2:2", when="@1:2.0", type=("build", "run"))
+    depends_on("py-rapidfuzz@3", when="@2.1:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-crashtest/package.py b/var/spack/repos/builtin/packages/py-crashtest/package.py
index f16c993168..d2dade000d 100644
--- a/var/spack/repos/builtin/packages/py-crashtest/package.py
+++ b/var/spack/repos/builtin/packages/py-crashtest/package.py
@@ -13,9 +13,11 @@ class PyCrashtest(PythonPackage):
     homepage = "https://github.com/sdispater/crashtest"
     pypi = "crashtest/crashtest-0.3.1.tar.gz"
 
+    version("0.4.1", sha256="80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce")
     version("0.4.0", sha256="d629b00f1d4e79c316909f4eb763bbcb29b510d65fbde1365a1ceb93ab7fa4c8")
     version("0.3.1", sha256="42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd")
 
     depends_on("python@3.6:3", type=("build", "run"))
     depends_on("python@3.7:3", when="@0.4.0:", type=("build", "run"))
     depends_on("py-poetry-core@1:", type="build")
+    depends_on("py-poetry-core@1.1.0:", when="@0.4.1:", type="build")
diff --git a/var/spack/repos/builtin/packages/py-jarowinkler/package.py b/var/spack/repos/builtin/packages/py-jarowinkler/package.py
new file mode 100644
index 0000000000..9256776613
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-jarowinkler/package.py
@@ -0,0 +1,21 @@
+# 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 PyJarowinkler(PythonPackage):
+    """library for fast approximate string matching using Jaro and Jaro-Winkler similarity."""
+
+    homepage = "https://github.com/maxbachmann/JaroWinkler"
+    pypi = "jarowinkler/jarowinkler-1.2.3.tar.gz"
+
+    maintainers("LydDeb")
+
+    version("1.2.3", sha256="af28ea284cfbd1b21b29ff94b759f20e94e4f7c06f424b0b4702e701c2a21668")
+
+    depends_on("py-setuptools@42:", type="build")
+    depends_on("py-scikit-build@0.15.0", type="build")
+    depends_on("py-rapidfuzz-capi@1.0.5", type="build")
diff --git a/var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py b/var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py
new file mode 100644
index 0000000000..af0ebea5b2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py
@@ -0,0 +1,21 @@
+# 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 PyRapidfuzzCapi(PythonPackage):
+    """
+    C-API of RapidFuzz, which can be used to extend RapidFuzz from separate packages.
+    """
+
+    homepage = "https://github.com/maxbachmann/rapidfuzz_capi"
+    pypi = "rapidfuzz_capi/rapidfuzz_capi-1.0.5.tar.gz"
+
+    maintainers("LydDeb")
+
+    version("1.0.5", sha256="b3af179874b28364ba1b7850e37d0d353de9cf5b844e3569c023b74da3a9c68e")
+
+    depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-rapidfuzz/package.py b/var/spack/repos/builtin/packages/py-rapidfuzz/package.py
index 5bfd1563b5..a1213a1b37 100644
--- a/var/spack/repos/builtin/packages/py-rapidfuzz/package.py
+++ b/var/spack/repos/builtin/packages/py-rapidfuzz/package.py
@@ -13,12 +13,16 @@ class PyRapidfuzz(PythonPackage):
     pypi = "rapidfuzz/rapidfuzz-1.8.2.tar.gz"
 
     version("3.3.1", sha256="6783b3852f15ed7567688e2e358757a7b4f38683a915ba5edc6c64f1a3f0b450")
+    version("2.2.0", sha256="acb8839aac452ec61a419fdc8799e8a6e6cd21bed53d04678cdda6fba1247e2f")
     version("1.8.2", sha256="d6efbb2b6b18b3a67d7bdfbcd9bb72732f55736852bbef823bdf210f9e0c6c90")
 
     depends_on("python", type=("build", "link", "run"))
-    depends_on("py-setuptools@42:", when="@3:", type="build")
+    depends_on("py-setuptools@42:", when="@2:", type="build")
     depends_on("py-setuptools", type="build")
     depends_on("py-scikit-build@0.17", when="@3:", type="build")
+    depends_on("py-scikit-build@0.13:", when="@2.2:", type="build")
+    depends_on("py-rapidfuzz-capi@1.0.5", when="@2", type="build")
+    depends_on("py-jarowinkler@1.2.0:1", when="@2", type=("build", "run"))
 
     # CMakeLists.txt
     depends_on("cmake@3.12:", type="build")