py-notebook: add 6.5.4 (#38415)

* py-notebook: add 6.5.4

* [@spackbot] updating style on behalf of manuelakuhn

* Update var/spack/repos/builtin/packages/py-notebook/package.py

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

* Fix version of py-nbclassic dependency

---------

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

1 files changed, 27 insertions, 26 deletions

diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py
index 0bb06e8f40..6c3a5a6983 100644
--- a/var/spack/repos/builtin/packages/py-notebook/package.py
+++ b/var/spack/repos/builtin/packages/py-notebook/package.py
@@ -13,6 +13,7 @@ class PyNotebook(PythonPackage):
     homepage = "https://github.com/jupyter/notebook"
     pypi = "notebook/notebook-6.1.4.tar.gz"
 
+    version("6.5.4", sha256="517209568bd47261e2def27a140e97d49070602eea0d226a696f42a7f16c9a4e")
     version("6.4.12", sha256="6268c9ec9048cff7a45405c990c29ac9ca40b0bc3ec29263d218c5e01f2b4e86")
     version("6.4.11", sha256="709b1856a564fe53054796c80e17a67262071c86bfbdfa6b96aaa346113c555a")
     version("6.4.5", sha256="872e20da9ae518bbcac3e4e0092d5bd35454e847dedb8cb9739e9f3b68406be0")
@@ -37,42 +38,42 @@ class PyNotebook(PythonPackage):
     version("4.0.4", sha256="a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648")
     version("4.0.2", sha256="8478d7e2ab474855b0ff841f693983388af8662d3af1adcb861acb900274f22a")
 
-    depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
-    depends_on("python@3.5:", type=("build", "run"), when="@6:")
-    depends_on("python@3.6:", type=("build", "run"), when="@6.3:")
     depends_on("python@3.7:", type=("build", "run"), when="@6.4:")
+    depends_on("python@3.6:", type=("build", "run"), when="@6.3:")
     # TODO: replace this after concretizer learns how to concretize separate build deps
     depends_on("py-jupyter-packaging11", when="@6.4.1:", type="build")
     # depends_on('py-jupyter-packaging@0.9:0', when='@6.4.1:', type='build')
-    depends_on("py-setuptools", type=("build", "run"), when="@5:")
+
+    depends_on("py-setuptools", when="@5:", type="build")
     depends_on("py-jinja2", type=("build", "run"))
-    depends_on("py-tornado@4.0:6", type=("build", "run"), when="@:5.7.4")
-    depends_on("py-tornado@4.1:6", type=("build", "run"), when="@5.7.5:5")
-    depends_on("py-tornado@5.0:", type=("build", "run"), when="@6:")
-    depends_on("py-tornado@6.1:", type=("build", "run"), when="@6.4.5:")
-    depends_on("py-pyzmq@17:", type=("build", "run"), when="@6:")
-    depends_on("py-argon2-cffi", type=("build", "run"), when="@6.1:")
+    depends_on("py-tornado@6.1:", when="@6.4.5:", type=("build", "run"))
+    depends_on("py-tornado@5.0:", when="@6:", type=("build", "run"))
+    depends_on("py-tornado@4.1:6", when="@5.7.5:5", type=("build", "run"))
+    depends_on("py-tornado@4.0:6", when="@:5.7.4", type=("build", "run"))
+    depends_on("py-pyzmq@17:", when="@6:", type=("build", "run"))
+    depends_on("py-argon2-cffi", when="@6.1:", type=("build", "run"))
+    depends_on("py-traitlets@4.2.1:", when="@5:", type=("build", "run"))
     depends_on("py-traitlets", type=("build", "run"))
-    depends_on("py-traitlets@4.2.1:", type=("build", "run"), when="@5:")
+    depends_on("py-jupyter-core@4.6.1:", when="@6.0.3:", type=("build", "run"))
+    depends_on("py-jupyter-core@4.6.0:", when="@6.0.2", type=("build", "run"))
+    depends_on("py-jupyter-core@4.4.0:", when="@5.7.0:6.0.1", type=("build", "run"))
     depends_on("py-jupyter-core", type=("build", "run"))
-    depends_on("py-jupyter-core@4.4.0:", type=("build", "run"), when="@5.7.0:6.0.1")
-    depends_on("py-jupyter-core@4.6.0:", type=("build", "run"), when="@6.0.2")
-    depends_on("py-jupyter-core@4.6.1:", type=("build", "run"), when="@6.0.3:")
+    depends_on("py-jupyter-client@5.3.4:", when="@6.0.2:", type=("build", "run"))
+    depends_on("py-jupyter-client@5.3.1:", when="@6.0.0:6.0.1", type=("build", "run"))
+    depends_on("py-jupyter-client@5.2.0:", when="@5.7.0:5", type=("build", "run"))
     depends_on("py-jupyter-client", type=("build", "run"))
-    depends_on("py-jupyter-client@5.2.0:", type=("build", "run"), when="@5.7.0:5")
-    depends_on("py-jupyter-client@5.3.1:", type=("build", "run"), when="@6.0.0:6.0.1")
-    depends_on("py-jupyter-client@5.3.4:", type=("build", "run"), when="@6.0.2:")
     depends_on("py-ipython-genutils", type=("build", "run"))
     depends_on("py-nbformat", type=("build", "run"))
     # https://github.com/jupyter/notebook/pull/6286
-    depends_on("py-nbconvert@5:", type=("build", "run"), when="@5.5:")
+    depends_on("py-nbconvert@5:", when="@5.5:", type=("build", "run"))
     depends_on("py-nbconvert", type=("build", "run"))
-    depends_on("py-nest-asyncio@1.5:", type=("build", "run"), when="@6.4.10:")
+    depends_on("py-nest-asyncio@1.5:", when="@6.4.10:", type=("build", "run"))
     depends_on("py-ipykernel", type=("build", "run"))
-    depends_on("py-send2trash", type=("build", "run"), when="@6:")
-    depends_on("py-send2trash@1.5:", type=("build", "run"), when="@6.2.0:")
-    depends_on("py-send2trash@1.8:", type=("build", "run"), when="@6.4.10:")
-    depends_on("py-terminado@0.3.3:", type=("build", "run"), when="@:5.7.0")
-    depends_on("py-terminado@0.8.1:", type=("build", "run"), when="@5.7.0:")
-    depends_on("py-terminado@0.8.3:", type=("build", "run"), when="@6.1:")
-    depends_on("py-prometheus-client", type=("build", "run"), when="@5.7.0:")
+    depends_on("py-send2trash@1.8:", when="@6.4.10:", type=("build", "run"))
+    depends_on("py-send2trash@1.5:", when="@6.2.0:", type=("build", "run"))
+    depends_on("py-send2trash", when="@6:", type=("build", "run"))
+    depends_on("py-terminado@0.8.3:", when="@6.1:", type=("build", "run"))
+    depends_on("py-terminado@0.8.1:", when="@5.7.0:", type=("build", "run"))
+    depends_on("py-terminado@0.3.3:", when="@:5.7.0", type=("build", "run"))
+    depends_on("py-prometheus-client", when="@5.7.0:", type=("build", "run"))
+    depends_on("py-nbclassic@0.4.7:", when="@6.5:", type=("build", "run"))