py-nbconvert: add 7.4.0 (#38326)

* py-nbconvert: add 7.4.0

* Move historical dependencies after variant

1 files changed, 20 insertions, 19 deletions

diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py
index 224c6945a5..3243c5d637 100644
--- a/var/spack/repos/builtin/packages/py-nbconvert/package.py
+++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py
@@ -13,6 +13,7 @@ class PyNbconvert(PythonPackage):
     homepage = "https://github.com/jupyter/nbconvert"
     pypi = "nbconvert/nbconvert-6.0.1.tar.gz"
 
+    version("7.4.0", sha256="51b6c77b507b177b73f6729dba15676e42c4e92bcb00edc8cc982ee72e7d89d7")
     version("7.0.0", sha256="fd1e361da30e30e4c5a5ae89f7cae95ca2a4d4407389672473312249a7ba0060")
     version("6.5.1", sha256="2c01f3f518fee736c3d3f999dd20e0a16febba17a0d60a3b0fd28fbdec14115d")
     version("6.5.0", sha256="223e46e27abe8596b8aed54301fadbba433b7ffea8196a68fd7b1ff509eee99d")
@@ -28,43 +29,35 @@ class PyNbconvert(PythonPackage):
 
     variant("serve", default=True, description="Include a webserver")
 
-    depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@5:", type=("build", "run"))
-    depends_on("python@3.6:", when="@6:", type=("build", "run"))
     depends_on("python@3.7:", when="@6.2.0:", type=("build", "run"))
-    depends_on("py-setuptools", when="@5:6", type=("build", "run"))
-    depends_on("py-setuptools@60:", when="@6.5:6", type=("build", "run"))
     depends_on("py-hatchling@0.25:", when="@7:", type="build")
-    depends_on("py-lxml", when="@6.5.1:", type=("build", "run"))
+
     depends_on("py-beautifulsoup4", when="@6.4.4:", type=("build", "run"))
     depends_on("py-bleach", when="@5:", type=("build", "run"))
     depends_on("py-defusedxml", when="@5:", type=("build", "run"))
     depends_on("py-importlib-metadata@3.6:", when="@7: ^python@:3.9", type=("build", "run"))
-    depends_on("py-jinja2", type=("build", "run"))
-    depends_on("py-jinja2@2.4:", when="@5:", type=("build", "run"))
     depends_on("py-jinja2@3:", when="@6.5:", type=("build", "run"))
-    depends_on("py-jupyter-core", type=("build", "run"))
+    depends_on("py-jinja2@2.4:", when="@5:", type=("build", "run"))
+    depends_on("py-jinja2", type=("build", "run"))
     depends_on("py-jupyter-core@4.7:", when="@6.5:", type=("build", "run"))
+    depends_on("py-jupyter-core", type=("build", "run"))
     depends_on("py-jupyterlab-pygments", when="@6:", type=("build", "run"))
     depends_on("py-markupsafe@2:", when="@6.4.5:", type=("build", "run"))
-    depends_on("py-mistune@0.8.1:1", when="@:6", type=("build", "run"))
     depends_on("py-mistune@2.0.3:2", when="@7:", type=("build", "run"))
-    depends_on("py-nbclient@0.5", when="@6:6.4", type=("build", "run"))
+    depends_on("py-mistune@0.8.1:1", when="@:6", type=("build", "run"))
     depends_on("py-nbclient@0.5:", when="@6.5:", type=("build", "run"))
-    depends_on("py-nbformat", type=("build", "run"))
-    depends_on("py-nbformat@4.4:", when="@5:", type=("build", "run"))
+    depends_on("py-nbclient@0.5", when="@6:6.4", type=("build", "run"))
     depends_on("py-nbformat@5.1:", when="@6.5:", type=("build", "run"))
+    depends_on("py-nbformat@4.4:", when="@5:", type=("build", "run"))
+    depends_on("py-nbformat", type=("build", "run"))
     depends_on("py-packaging", when="@6.5:", type=("build", "run"))
     depends_on("py-pandocfilters@1.4.1:", when="@5:", type=("build", "run"))
-    depends_on("py-pygments", type=("build", "run"))
     depends_on("py-pygments@2.4.1:", when="@6:", type=("build", "run"))
+    depends_on("py-pygments", type=("build", "run"))
     depends_on("py-tinycss2", when="@6.5:", type=("build", "run"))
-    depends_on("py-traitlets", type=("build", "run"))
-    depends_on("py-traitlets@4.2:", when="@5:", type=("build", "run"))
     depends_on("py-traitlets@5:", when="@6.2.0:", type=("build", "run"))
-    depends_on("py-entrypoints", when="@:6", type=("build", "run"))
-    depends_on("py-entrypoints@0.2.2:", when="@5:6", type=("build", "run"))
-    depends_on("py-testpath", when="@5:6.4", type=("build", "run"))
+    depends_on("py-traitlets@4.2:", when="@5:", type=("build", "run"))
+    depends_on("py-traitlets", type=("build", "run"))
 
     # https://bugs.gentoo.org/720870
     # https://github.com/jupyter/nbconvert/pull/937
@@ -72,6 +65,14 @@ class PyNbconvert(PythonPackage):
     depends_on("py-tornado@4.0:", when="@5.4.1: +serve", type=("build", "run"))
     depends_on("py-tornado@4.0:5", when="@:5.4.0 +serve", type=("build", "run"))
 
+    # Historical dependencies
+    depends_on("py-setuptools", when="@5:6", type=("build", "run"))
+    depends_on("py-setuptools@60:", when="@6.5:6", type=("build", "run"))
+    depends_on("py-entrypoints", when="@:6", type=("build", "run"))
+    depends_on("py-entrypoints@0.2.2:", when="@5:6", type=("build", "run"))
+    depends_on("py-testpath", when="@5:6.4", type=("build", "run"))
+    depends_on("py-lxml", when="@6.5.1:7.0", type=("build", "run"))
+
     def patch(self):
         # We bundle this with the spack package so that the installer
         # doesn't try to download it.