From de589b4bd836512d1c8b37bfac848d43582b6c51 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 17:29:50 +0900 Subject: [PATCH 1/3] python311Packages.jupyterlab-server: rename from jupyterlab_server --- .../{jupyterlab_server => jupyterlab-server}/default.nix | 5 +++-- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- pkgs/development/python-modules/notebook/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{jupyterlab_server => jupyterlab-server}/default.nix (95%) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix similarity index 95% rename from pkgs/development/python-modules/jupyterlab_server/default.nix rename to pkgs/development/python-modules/jupyterlab-server/default.nix index 6deb3912730b..cb953ae7d684 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -19,14 +19,15 @@ }: buildPythonPackage rec { - pname = "jupyterlab_server"; + pname = "jupyterlab-server"; version = "2.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "jupyterlab_server"; + inherit version; hash = "sha256-d8Lx8oLWEPleSW4g1b8dKncGgm37exjzN4rihw0nL7c="; }; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 763e44fb142f..6a6acff7aaf3 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -9,7 +9,7 @@ , ipykernel , jupyter-core , jupyter-lsp -, jupyterlab_server +, jupyterlab-server , jupyter-server , notebook-shim , jinja2 @@ -42,7 +42,7 @@ buildPythonPackage rec { ipykernel jupyter-core jupyter-lsp - jupyterlab_server + jupyterlab-server jupyter-server notebook-shim jinja2 diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 0532d2472a7f..88f4c975a858 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -7,7 +7,7 @@ , hatchling , jupyter-server , jupyterlab -, jupyterlab_server +, jupyterlab-server , notebook-shim , tornado , pytest-jupyter @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter-server jupyterlab - jupyterlab_server + jupyterlab-server notebook-shim tornado ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 30a0d6472232..ab312b24c0dc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -214,6 +214,7 @@ mapAliases ({ jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11 + jupyterlab_server = jupyterlab-server; # added 2023-11-12 Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41cf6b5344fc..48452da48686 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5825,7 +5825,7 @@ self: super: with self; { jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; - jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + jupyterlab-server = callPackage ../development/python-modules/jupyterlab-server { }; jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { }; From 64b305352ebdbf941e3986f41a580a484b0028f9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 17:34:57 +0900 Subject: [PATCH 2/3] python311Packages.jupyterlab-server: 2.25.0 -> 2.25.1 Changelog: https://github.com/jupyterlab/jupyterlab_server/blob/v2.25.1/CHANGELOG.md --- .../python-modules/jupyterlab-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index cb953ae7d684..e81e67427377 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -20,15 +20,15 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.25.0"; + version = "2.25.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-d8Lx8oLWEPleSW4g1b8dKncGgm37exjzN4rihw0nL7c="; + hash = "sha256-ZJEoOwAAaY6uGjjEhQeTBWDfz3RhrqABU2hpiqs03Zw="; }; nativeBuildInputs = [ From 6008e57f33746a790522e0d2adfb4e88b8b74b05 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 18:25:43 +0900 Subject: [PATCH 3/3] python311Packages.jupyterlab-server: refactor --- .../jupyterlab-server/default.nix | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index e81e67427377..a408137650ac 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -1,27 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, hatchling -, jsonschema , pythonOlder -, requests -, pytestCheckHook -, json5 +, hatchling , babel +, importlib-metadata +, jinja2 +, json5 +, jsonschema , jupyter-server -, tomli +, packaging +, requests , openapi-core , pytest-jupyter +, pytestCheckHook , requests-mock , ruamel-yaml , strict-rfc3339 -, importlib-metadata }: buildPythonPackage rec { pname = "jupyterlab-server"; version = "2.25.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,62 +32,61 @@ buildPythonPackage rec { hash = "sha256-ZJEoOwAAaY6uGjjEhQeTBWDfz3RhrqABU2hpiqs03Zw="; }; + postPatch = '' + sed -i "/timeout/d" pyproject.toml + ''; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ - requests - jsonschema - json5 babel + jinja2 + json5 + jsonschema jupyter-server - tomli + packaging + requests ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - nativeCheckInputs = [ - openapi-core - pytestCheckHook - pytest-jupyter - requests-mock - ruamel-yaml - strict-rfc3339 - ]; + passthru.optional-dependencies = { + openapi = [ + openapi-core + ruamel-yaml + ]; + }; - postPatch = '' - sed -i "/timeout/d" pyproject.toml - ''; + nativeCheckInputs = [ + pytest-jupyter + pytestCheckHook + requests-mock + strict-rfc3339 + ] ++ passthru.optional-dependencies.openapi; preCheck = '' export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. - # Use setuptools or check PEP 632 for potential alternatives. - "-W ignore::DeprecationWarning" - ]; - disabledTestPaths = [ - "tests/test_settings_api.py" - "tests/test_themes_api.py" + # require optional language pack packages for tests "tests/test_translation_api.py" - "tests/test_workspaces_api.py" ]; - disabledTests = [ - "test_get_listing" + pythonImportsCheck = [ + "jupyterlab_server" + "jupyterlab_server.pytest_plugin" ]; __darwinAllowLocalNetworking = true; meta = with lib; { description = "A set of server components for JupyterLab and JupyterLab like applications"; - homepage = "https://jupyterlab-server.readthedocs.io/"; + homepage = "https://github.com/jupyterlab/jupyterlab_server"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; - license = licenses.bsdOriginal; + license = licenses.bsd3; maintainers = lib.teams.jupyter.members; }; }