From c11a4e0ad3478a8267c60792ece773e6fae83274 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Tue, 6 Dec 2022 18:43:28 +0100 Subject: py-nbclient: add 0.7.2 and py-jupyter-core: add 5.1.0 (#34348) --- .../repos/builtin/packages/py-jupyter-core/package.py | 6 ++++++ var/spack/repos/builtin/packages/py-nbclient/package.py | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py index ed411733a4..1cab6c45e4 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-core/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py @@ -11,7 +11,9 @@ class PyJupyterCore(PythonPackage): homepage = "https://jupyter-core.readthedocs.io/" pypi = "jupyter-core/jupyter_core-4.6.0.tar.gz" + git = "https://github.com/jupyter/jupyter_core.git" + version("5.1.0", sha256="a5ae7c09c55c0b26f692ec69323ba2b62e8d7295354d20f6cd57b749de4a05bf") version("4.11.1", sha256="2e5f244d44894c4154d06aeae3419dd7f1b0ef4494dc5584929b398c61cfd314") version("4.9.2", sha256="d69baeb9ffb128b8cd2657fcf2703f89c769d1673c851812119e3a2a0e93ad9a") version("4.7.1", sha256="79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4") @@ -30,11 +32,15 @@ class PyJupyterCore(PythonPackage): version("4.0.1", sha256="7c165f7de7a063596f8be1bcfc86e9ba6897e38baf24e8510514690963600122") version("4.0.0", sha256="9025208cdfc40718c7e3ab62b5e17aacf68e3fc66e34ff21fe032d553620122a") + depends_on("python@3.8:", when="@5:", type=("build", "run")) depends_on("python@3.7:", when="@4.11.1:", type=("build", "run")) depends_on("python@3.6:", when="@4.7:", type=("build", "run")) depends_on("python@2.7:2.8,3.5:", when="@4.6.2:", type=("build", "run")) depends_on("python@2.7:2.8,3.3:", type=("build", "run")) depends_on("py-setuptools", when="@:4.9.2", type=("build", "run")) depends_on("py-hatchling@1.4:", when="@4.11.1:", type="build") + + depends_on("py-platformdirs@2.5:", when="@5.1:", type=("build", "run")) + depends_on("py-traitlets@5.3:", when="@5.1:", type=("build", "run")) depends_on("py-traitlets", type=("build", "run")) # additional pywin32>=1.0 dependency for windows diff --git a/var/spack/repos/builtin/packages/py-nbclient/package.py b/var/spack/repos/builtin/packages/py-nbclient/package.py index b2e44825e5..66ff0fd2be 100644 --- a/var/spack/repos/builtin/packages/py-nbclient/package.py +++ b/var/spack/repos/builtin/packages/py-nbclient/package.py @@ -14,7 +14,9 @@ class PyNbclient(PythonPackage): homepage = "https://jupyter.org/" pypi = "nbclient/nbclient-0.5.0.tar.gz" + git = "https://github.com/jupyter/nbclient.git" + version("0.7.2", sha256="884a3f4a8c4fc24bb9302f263e0af47d97f0d01fe11ba714171b320c8ac09547") version("0.6.7", sha256="3c5a7fc6bb74be7d31edf2817b44501a65caa99e5e56363bc359649b97cd24b9") version("0.6.6", sha256="0df76a7961d99a681b4796c74a1f2553b9f998851acc01896dce064ad19a9027") version("0.5.13", sha256="40c52c9b5e3c31faecaee69f202b3f53e38d7c1c563de0fadde9d7eda0fdafe8") @@ -24,11 +26,18 @@ class PyNbclient(PythonPackage): depends_on("python@3.7:", when="@0.5.13:", type=("build", "run")) depends_on("python@3.6.1:", when="@0.5.5:", type=("build", "run")) depends_on("python@3.6:", type=("build", "run")) - depends_on("py-setuptools", type="build") + depends_on("py-setuptools", when="@:0.7.0", type="build") + depends_on("py-hatchling@1.10:", when="@0.7.1:", type="build") + + depends_on("py-jupyter-client@6.1.12:", when="@0.7.1:", type=("build", "run")) depends_on("py-jupyter-client@6.1.5:", type=("build", "run")) + depends_on("py-jupyter-core@4.12:4,5.1:", when="@0.7.1:", type=("build", "run")) + depends_on("py-nbformat@5.1:", when="@0.7.1:", type=("build", "run")) depends_on("py-nbformat@5.0:", type=("build", "run")) - depends_on("py-async-generator", type=("build", "run"), when="@0.5.0") - depends_on("py-nest-asyncio", type=("build", "run")) + depends_on("py-traitlets@5.3:", when="@0.7.1:", type=("build", "run")) depends_on("py-traitlets@5.2.2:", when="@0.6:", type=("build", "run")) depends_on("py-traitlets@5:", when="@0.5.13:", type=("build", "run")) depends_on("py-traitlets@4.2:", type=("build", "run")) + + depends_on("py-async-generator", when="@0.5.0", type=("build", "run")) + depends_on("py-nest-asyncio", when="@:0.7.0", type=("build", "run")) -- cgit v1.2.3-60-g2f50