py-multiqc: updating to @1.21, adding new dependency py-pyyaml-env (#44768)

* py-multiqc: updating to @1.21, adding new dependency py-pyyaml-env
* Correcting dependencies
* Drop matplotlib depends_on() for versions of multiqc not included in package.py

---------

Co-authored-by: LMS Bioinformatics <bioinformatics@lms.mrc.ac.uk>

2 files changed, 52 insertions, 15 deletions

diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py
index 7ac74a5e3c..eb4d18e969 100644
--- a/var/spack/repos/builtin/packages/py-multiqc/package.py
+++ b/var/spack/repos/builtin/packages/py-multiqc/package.py
@@ -14,28 +14,45 @@ class PyMultiqc(PythonPackage):
     homepage = "https://multiqc.info"
     pypi = "multiqc/multiqc-1.0.tar.gz"
 
-    license("GPL-3.0-only")
+    license("GPL-3.0-only", checked_by="A_N_Other")
 
+    version("1.21", sha256="63bc87e251dbf788dcc8a45e58482ea09b26d05957bf50c77c684d5f0972a495")
     version("1.15", sha256="ce5359a12226cf4ce372c6fdad142cfe2ae7501ffa97ac7aab544ced4db5ea3c")
     version("1.14", sha256="dcbba405f0c9521ed2bbd7e8f7a9200643047311c9619878b81d167300149362")
     version("1.13", sha256="0564fb0f894e6ca0822a0f860941b3ed2c33dce407395ac0c2103775d45cbfa0")
 
+    # dependency defintions move from setup.py to pyproject.toml as of @1.21:
+
+    # build deps
     depends_on("py-setuptools", type="build")
-    depends_on("py-matplotlib@2.1.1:", type=("build", "run"))
-    depends_on("py-networkx@2.5.1:", type=("build", "run"))
-    depends_on("py-numpy", type=("build", "run"))
+
+    # current run deps
     depends_on("py-click", type=("build", "run"))
-    depends_on("py-coloredlogs", type=("build", "run"))
-    depends_on("py-future@0.14.1:", type=("build", "run"))
+    depends_on("py-humanize", type=("build", "run"), when="@1.18:")
+    depends_on("py-importlib-metadata", type=("build", "run"), when="@1.16:")
     depends_on("py-jinja2@3.0.0:", type=("build", "run"), when="@1.14:")
     depends_on("py-jinja2@2.9:", type=("build", "run"), when="@:1.13")
-    depends_on("py-lzstring", type=("build", "run"))
-    depends_on("py-markdown", type=("build", "run"))
+    depends_on("py-kaleido", type=("build", "run"), when="@1.20:")
+    depends_on("py-markdown", type=("build", "run"), when="@1.3:")
+    depends_on("py-matplotlib@2.1.1:", type=("build", "run"), when="@1.13:")
+    depends_on("py-numpy", type=("build", "run"))
+    depends_on("py-packaging", type=("build", "run"), when="@1.16:")
+    depends_on("py-requests", type=("build", "run"), when="@1.3:")
+    depends_on("py-pillow@10:", type=("build", "run"), when="@1.20:")
+    depends_on("py-plotly@5.18:", type=("build", "run"), when="@1.21:")
+    depends_on("py-plotly", type=("build", "run"), when="@1.20")
+    depends_on("py-pyyaml@4:", type=("build", "run"), when="@1.13:")
     depends_on("py-pyyaml", type=("build", "run"))
-    depends_on("py-pyyaml@4:", type=("build", "run"))
-    depends_on("py-requests", type=("build", "run"))
-    depends_on("py-rich@10:", type=("build", "run"))
-    depends_on("py-rich-click", type=("build", "run"))
-    depends_on("py-simplejson", type=("build", "run"))
-    depends_on("py-spectra@0.0.10:", type=("build", "run"))
-    depends_on("py-spectra", type=("build", "run"))
+    depends_on("py-pyaml-env", type=("build", "run"), when="@1.18:")
+    depends_on("py-rich@10:", type=("build", "run"), when="@1.13:")
+    depends_on("py-rich-click", type=("build", "run"), when="@1.13:")
+    depends_on("py-coloredlogs", type=("build", "run"), when="@1.13:")
+    depends_on("py-spectra@0.0.10:", type=("build", "run"), when="@1.4:")
+    depends_on("py-spectra", type=("build", "run"), when="@1.18:")
+
+    # retired run deps
+    depends_on("py-future@0.14.1:", type=("build", "run"), when="@1.13:1.19")
+    depends_on("py-lzstring", type=("build", "run"), when="@:1.16")
+    depends_on("py-networkx@2.5.1:", type=("build", "run"), when="@1.13:1.20")
+    depends_on("py-networkx@:1", type=("build", "run"), when="@1.3")
+    depends_on("py-simplejson", type=("build", "run"), when="@:1.15")
diff --git a/var/spack/repos/builtin/packages/py-pyaml-env/package.py b/var/spack/repos/builtin/packages/py-pyaml-env/package.py
new file mode 100644
index 0000000000..298fc9f778
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pyaml-env/package.py
@@ -0,0 +1,20 @@
+# Copyright 2013-2024 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 PyPyamlEnv(PythonPackage):
+    """Provides yaml file parsing with environment variable resolution"""
+
+    homepage = "https://github.com/mkaranasou/pyaml_env"
+    pypi = "pyaml_env/pyaml_env-1.2.1.tar.gz"
+
+    license("MIT", checked_by="A_N_Other")
+
+    version("1.2.1", sha256="6d5dc98c8c82df743a132c196e79963050c9feb05b0a6f25f3ad77771d3d95b0")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-pyyaml@5:7", type=("build", "run"))