py-nbclassic: add 0.4.8 and new package py-notebook-shim (#34320)

* py-nbclassic: add 0.4.8 and new package py-notebook-shim

* Add missing dependencies

2 files changed, 46 insertions, 2 deletions

diff --git a/var/spack/repos/builtin/packages/py-nbclassic/package.py b/var/spack/repos/builtin/packages/py-nbclassic/package.py
index 803bc1c699..7be818142d 100644
--- a/var/spack/repos/builtin/packages/py-nbclassic/package.py
+++ b/var/spack/repos/builtin/packages/py-nbclassic/package.py
@@ -12,13 +12,37 @@ class PyNbclassic(PythonPackage):
     homepage = "https://github.com/jupyterlab/nbclassic"
     pypi = "nbclassic/nbclassic-0.3.1.tar.gz"
 
+    version("0.4.8", sha256="c74d8a500f8e058d46b576a41e5bc640711e1032cf7541dde5f73ea49497e283")
     version("0.3.5", sha256="99444dd63103af23c788d9b5172992f12caf8c3098dd5a35c787f0df31490c29")
     version("0.3.1", sha256="f920f8d09849bea7950e1017ff3bd101763a8d68f565a51ce053572e65aa7947")
 
+    depends_on("python@3.7:", when="@0.3.6:", type=("build", "run"))
     depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
     # TODO: replace this after concretizer learns how to concretize separate build deps
     depends_on("py-jupyter-packaging11", when="@0.3.3:", type="build")
     # depends_on('py-jupyter-packaging@0.9:1', when='@0.3.3:', type='build')
-    depends_on("py-jupyter-server@1.8:1", type=("build", "run"))
-    depends_on("py-notebook@:6", type=("build", "run"))
+    depends_on("py-babel", when="@0.4:", type="build")
+
+    depends_on("py-jinja2", when="@0.4:", type=("build", "run"))
+    depends_on("py-tornado@6.1:", when="@0.4:", type=("build", "run"))
+    depends_on("py-pyzmq@17:", when="@0.4:", type=("build", "run"))
+    depends_on("py-argon2-cffi", when="@0.4:", type=("build", "run"))
+    depends_on("py-traitlets@4.2.1:", when="@0.4:", type=("build", "run"))
+    depends_on("py-jupyter-core@4.6.1:", when="@0.4:", type=("build", "run"))
+    depends_on("py-jupyter-client@6.1.1:", when="@0.4:", type=("build", "run"))
+    depends_on("py-ipython-genutils", when="@0.4:", type=("build", "run"))
+    # version requirement for py-jupyter-server comes from setup.cfg
+    depends_on("py-jupyter-server@1.17:", when="@0.4:", type=("build", "run"))
+    depends_on("py-jupyter-server@1.8:", when="@0.3.7", type=("build", "run"))
+    depends_on("py-jupyter-server@1.8:1", when="@:0.3.6", type=("build", "run"))
+    depends_on("py-nbformat", when="@0.4:", type=("build", "run"))
+    depends_on("py-notebook-shim@0.1:", when="@0.3.6:", type=("build", "run"))
+    depends_on("py-nbconvert@5:", when="@0.4:", type=("build", "run"))
+    depends_on("py-nest-asyncio@1.5:", when="@0.4:", type=("build", "run"))
+    depends_on("py-ipykernel", when="@0.4:", type=("build", "run"))
+    depends_on("py-send2trash@1.8:", when="@0.4:", type=("build", "run"))
+    depends_on("py-terminado@0.8.3:", when="@0.4:", type=("build", "run"))
+    depends_on("py-prometheus-client", when="@0.4:", type=("build", "run"))
+
+    depends_on("py-notebook@:6", when="@:0.3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-notebook-shim/package.py b/var/spack/repos/builtin/packages/py-notebook-shim/package.py
new file mode 100644
index 0000000000..9a04a98bac
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-notebook-shim/package.py
@@ -0,0 +1,20 @@
+# Copyright 2013-2022 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 PyNotebookShim(PythonPackage):
+    """A shim layer for notebook traits and config."""
+
+    homepage = "https://github.com/jupyter/notebook_shim"
+    pypi = "notebook_shim/notebook_shim-0.2.2.tar.gz"
+
+    version("0.2.2", sha256="090e0baf9a5582ff59b607af523ca2db68ff216da0c69956b62cab2ef4fc9c3f")
+
+    depends_on("python@3.7:", type=("build", "run"))
+    depends_on("py-hatchling@1:", type="build")
+
+    depends_on("py-jupyter-server@1.8:2", type=("build", "run"))