From f3523d8655d8307fb3761434a5bbeb77754b5cea Mon Sep 17 00:00:00 2001 From: iarspider Date: Mon, 17 Oct 2022 15:42:01 +0200 Subject: py-jupyterlab-pygments: install from wheel to avoid cyclic dependency (#33278) * py-jupyterlab-pygments: avoid cyclic dependency * Fix style * Update package.py * Update package.py * [@spackbot] updating style on behalf of iarspider * Update package.py * Flake-8 * fix Co-authored-by: iarspider --- .../packages/py-jupyterlab-pygments/package.py | 28 ++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py index 9335e2db48..5f5973273c 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py @@ -11,14 +11,28 @@ class PyJupyterlabPygments(PythonPackage): """Pygments theme using JupyterLab CSS variables.""" homepage = "https://jupyter.org/" - pypi = "jupyterlab-pygments/jupyterlab_pygments-0.1.1.tar.gz" + url = "https://files.pythonhosted.org/packages/py2.py3/j/jupyterlab-pygments/jupyterlab_pygments-0.2.2-py2.py3-none-any.whl" + # We use wheels because in @0.2.2: there is a cyclic dependency between + # py-nbconvert and py-jupyter-server: + # py-nbconvert -> py-jupyterlab-pygments -> py-jupyterlab -> + # -> py-jupyter-server -> py-nbconvert + # Reported here: https://github.com/jupyterlab/jupyterlab_pygments/issues/23 - version("0.2.2", sha256="7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d") - version("0.1.2", sha256="cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146") - version("0.1.1", sha256="19a0ccde7daddec638363cd3d60b63a4f6544c9181d65253317b2fb492a797b9") + version( + "0.2.2", + sha256="2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f", + expand=False, + ) + version( + "0.1.2", + sha256="abfb880fd1561987efaefcb2d2ac75145d2a5d0139b1876d5be806e32f630008", + expand=False, + ) + version( + "0.1.1", + sha256="c9535e5999f29bff90bd0fa423717dcaf247b71fad505d66b17d3217e9021fc5", + expand=False, + ) depends_on("python@3.7:", when="@0.2.2:", type=("build", "run")) - depends_on("py-setuptools", when="@:0.1.2", type="build") - depends_on("py-jupyter-packaging11", when="@0.2.2:", type="build") - depends_on("py-jupyterlab@3.1:3", when="@0.2.2:", type="build") depends_on("py-pygments@2.4.1:2", type=("build", "run")) -- cgit v1.2.3-70-g09d2