Add checksum for py-nbconvert 7.0.0, py-mistune 2.0.4 (#32817)

2 files changed, 37 insertions, 32 deletions

diff --git a/var/spack/repos/builtin/packages/py-mistune/package.py b/var/spack/repos/builtin/packages/py-mistune/package.py
index 089815e1d9..b67b90a389 100644
--- a/var/spack/repos/builtin/packages/py-mistune/package.py
+++ b/var/spack/repos/builtin/packages/py-mistune/package.py
@@ -12,6 +12,7 @@ class PyMistune(PythonPackage):
     homepage = "https://github.com/lepture/mistune"
     pypi = "mistune/mistune-2.0.2.tar.gz"
 
+    version("2.0.4", sha256="9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808")
     version("2.0.2", sha256="6fc88c3cb49dba8b16687b41725e661cf85784c12e8974a29b9d336dd596c3a1")
     version("0.8.4", sha256="59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e")
     version("0.8.3", sha256="bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619")
diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py
index 1d0a7c8383..50dac8c12e 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.0.0", sha256="fd1e361da30e30e4c5a5ae89f7cae95ca2a4d4407389672473312249a7ba0060")
     version("6.5.1", sha256="2c01f3f518fee736c3d3f999dd20e0a16febba17a0d60a3b0fd28fbdec14115d")
     version("6.5.0", sha256="223e46e27abe8596b8aed54301fadbba433b7ffea8196a68fd7b1ff509eee99d")
     version("6.4.2", sha256="eb2803db18f6facce6bf3b01b684fe47907994bd156d15eaccdf011e3d7f8164")
@@ -28,46 +29,49 @@ 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:", type=("build", "run"), when="@5:")
-    depends_on("python@3.6:", type=("build", "run"), when="@6:")
-    depends_on("python@3.7:", type=("build", "run"), when="@6.2.0:")
-    depends_on("py-setuptools", type=("build", "run"), when="@5:")
-    depends_on("py-setuptools@60:", type=("build", "run"), when="@6.5:")
-    depends_on("py-beautifulsoup4", type=("build", "run"), when="@6.4.4:")
-    depends_on("py-bleach", type=("build", "run"), when="@5:")
-    depends_on("py-defusedxml", type=("build", "run"), when="@5:")
-    depends_on("py-entrypoints", type=("build", "run"))
-    depends_on("py-entrypoints@0.2.2:", type=("build", "run"), when="@5:")
+    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:", type=("build", "run"), when="@5:")
-    depends_on("py-jinja2@3:", type=("build", "run"), when="@6.5:")
+    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-jupyter-core@4.7:", type=("build", "run"), when="@6.5:")
-    depends_on("py-jupyterlab-pygments", type=("build", "run"), when="@6:")
-    depends_on("py-markupsafe@2:", type=("build", "run"), when="@6.4.5:")
-    depends_on("py-mistune@0.8.1:1", type=("build", "run"))
-    depends_on("py-nbclient@0.5", type=("build", "run"), when="@6:6.4")
-    depends_on("py-nbclient@0.5:", type=("build", "run"), when="@6.5:")
+    depends_on("py-jupyter-core@4.7:", when="@6.5:", 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-nbclient@0.5:", when="@6.5:", type=("build", "run"))
     depends_on("py-nbformat", type=("build", "run"))
-    depends_on("py-nbformat@4.4:", type=("build", "run"), when="@5:")
-    depends_on("py-nbformat@5.1:", type=("build", "run"), when="@6.5:")
-    depends_on("py-packaging", type=("build", "run"), when="@6.5:")
-    depends_on("py-pandocfilters@1.4.1:", type=("build", "run"), when="@5:")
-    depends_on("py-pycurl", type="build", when="^python@:2.7.8")
+    depends_on("py-nbformat@4.4:", when="@5:", type=("build", "run"))
+    depends_on("py-nbformat@5.1:", when="@6.5:", 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:", type=("build", "run"), when="@6:")
-    depends_on("py-testpath", type=("build", "run"), when="@5:6.4")
-    depends_on("py-tinycss2", type=("build", "run"), when="@6.5:")
+    depends_on("py-pygments@2.4.1:", when="@6:", 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:", type=("build", "run"), when="@5:")
-    depends_on("py-traitlets@5:", type=("build", "run"), when="@6.2.0:")
-    depends_on("py-lxml", type=("build", "run"), when="@6.5.1:")
+    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-pycurl", when="^python@:2.7.8", type="build")
+    depends_on("py-testpath", when="@5:6.4", type=("build", "run"))
 
     # https://bugs.gentoo.org/720870
     # https://github.com/jupyter/nbconvert/pull/937
-    depends_on("py-tornado@6.1:", type=("build", "run"), when="@6.5: +serve")
-    depends_on("py-tornado@4.0:", type=("build", "run"), when="@5.4.1: +serve")
-    depends_on("py-tornado@4.0:5", type=("build", "run"), when="@:5.4.0 +serve")
+    depends_on("py-tornado@6.1:", when="@6.5: +serve", type=("build", "run"))
+    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"))
 
     def patch(self):
         # We bundle this with the spack package so that the installer