Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python310Packages.jupyterlab: 3.6.3 -> 4.0.3 #244209

Merged
merged 9 commits into from
Aug 7, 2023
Original file line number Diff line number Diff line change
@@ -1,36 +1,42 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchPypi
, hatch-jupyter-builder
, hatch-nodejs-version
, hatchling
, pythonRelaxDepsHook
, jupyter-events
, jupyter-server
, jupyter-server-fileid
, jupyter-ydoc
, ypy-websocket
, pytest-asyncio
, pytest-jupyter
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "jupyter-server-ydoc";
version = "0.8.0";
pname = "jupyter-collaboration";
version = "1.0.1";

disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";

format = "pyproject";

src = fetchFromGitHub {
owner = "jupyterlab";
repo = "jupyter_collaboration";
rev = "refs/tags/v${version}";
hash = "sha256-KLb7kU5jsj6ihGO6HU3Y7uF+0PcwKoQlqQAhtO0oaJw=";
src = fetchPypi {
pname = "jupyter_collaboration";
inherit version;
hash = "sha256-cf7BpF6WSoHQJQW0IXdpCAGTdkX9RNWZ4JovTHvcPho=";
};

postPatch = ''
sed -i "/^timeout/d" pyproject.toml
'';

nativeBuildInputs = [
hatch-jupyter-builder
hatch-nodejs-version
hatchling
pythonRelaxDepsHook
];
Expand All @@ -40,14 +46,17 @@ buildPythonPackage rec {
];

propagatedBuildInputs = [
jupyter-events
jupyter-server
jupyter-server-fileid
jupyter-ydoc
ypy-websocket
];

pythonImportsCheck = [ "jupyter_server_ydoc" ];
pythonImportsCheck = [ "jupyter_collaboration" ];

nativeCheckInputs = [
pytest-asyncio
pytest-jupyter
pytestCheckHook
];
Expand All @@ -57,10 +66,10 @@ buildPythonPackage rec {
'';

meta = {
changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${src.rev}/CHANGELOG.md";
description = "A Jupyter Server Extension Providing Y Documents";
changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md";
description = "JupyterLab Extension enabling Real-Time Collaboration";
homepage = "https://github.com/jupyterlab/jupyter_collaboration";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ dotlambda ];
maintainers = lib.teams.jupyter.members;
};
}
22 changes: 16 additions & 6 deletions pkgs/development/python-modules/jupyter-server/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,27 @@
, jupyter-server-terminals
, nbformat
, nbconvert
, packaging
, send2trash
, terminado
, prometheus-client
, anyio
, websocket-client
, overrides
, requests
, flaky
}:

buildPythonPackage rec {
pname = "jupyter-server";
version = "2.0.6";
version = "2.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";

src = fetchPypi {
pname = "jupyter_server";
inherit version;
hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8=";
hash = "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38=";
};

nativeBuildInputs = [
Expand All @@ -60,22 +63,23 @@ buildPythonPackage rec {
jupyter-server-terminals
nbformat
nbconvert
packaging
send2trash
terminado
prometheus-client
anyio
websocket-client
overrides
];

nativeCheckInputs = [
ipykernel
pandoc
pytestCheckHook
pytest-console-scripts
pytest-jupyter
pytest-timeout
pytest-tornasync
requests
flaky
];

preCheck = ''
Expand All @@ -85,11 +89,16 @@ buildPythonPackage rec {

disabledTests = [
"test_cull_idle"
"test_server_extension_list"
] ++ lib.optionals stdenv.isDarwin [
# attempts to use trashcan, build env doesn't allow this
"test_delete"
# test is presumable broken in sandbox
"test_authorized_requests"
# Insufficient access privileges for operation
"test_regression_is_hidden"
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
"test_copy_big_dir"
Comment on lines +100 to +101
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now seems to fail on x86_64-linux, too

Fix in #259428

];

disabledTestPaths = [
Expand All @@ -103,9 +112,10 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;

meta = with lib; {
changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md";
description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications";
homepage = "https://github.com/jupyter-server/jupyter_server";
license = licenses.bsdOriginal;
maintainers = [ maintainers.elohmeier ];
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elohmeier Would you like to be a member of teams.jupyter?

maintainers = lib.teams.jupyter.members;
};
}
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/jupyter-ydoc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

buildPythonPackage rec {
pname = "jupyter-ydoc";
version = "0.3.4";
version = "1.0.2";

format = "pyproject";

src = fetchPypi {
pname = "jupyter_ydoc";
inherit version;
hash = "sha256-WiJi5wvwBLgsxs5xZ16TMKoFj+MNsuh82BJa1N0a5OE=";
hash = "sha256-D5W+3j8eCB4H1cV8A8ZY46Ukfg7xiIkHT776IN0+ylM=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -46,6 +46,6 @@ buildPythonPackage rec {
description = "Document structures for collaborative editing using Ypy";
homepage = "https://github.com/jupyter-server/jupyter_ydoc";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ dotlambda ];
maintainers = lib.teams.jupyter.members;
};
}
42 changes: 19 additions & 23 deletions pkgs/development/python-modules/jupyterlab/default.nix
Original file line number Diff line number Diff line change
@@ -1,54 +1,50 @@
{ lib
, buildPythonPackage
, fetchPypi
, ipython
, hatch-jupyter-builder
, hatchling
, async-lru
, packaging
, tornado
, ipykernel
, jupyter-core
, jupyter-lsp
, jupyterlab_server
, jupyter-server
, jupyter-server-ydoc
, notebook
, notebook-shim
, jinja2
, tomli
, pythonOlder
, jupyter-packaging
, pythonRelaxDepsHook
, nbclassic
}:

buildPythonPackage rec {
pname = "jupyterlab";
version = "3.6.3";
format = "setuptools";
version = "4.0.3";
format = "pyproject";

disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";

src = fetchPypi {
inherit pname version;
hash = "sha256-Nz6c+4py7dKUvhTxZmJWOiIM7PD7Jt56qxr5optom4I=";
hash = "sha256-4U0c5GphMCgRHQ1Hah19awlAA7dGK6xmn1tHgxeryzk=";
};

nativeBuildInputs = [
jupyter-packaging
pythonRelaxDepsHook
];

pythonRelaxDeps = [
"jupyter-ydoc"
"jupyter-server-ydoc"
hatch-jupyter-builder
hatchling
];

propagatedBuildInputs = [
ipython
async-lru
packaging
tornado
ipykernel
jupyter-core
jupyter-lsp
jupyterlab_server
jupyter-server
jupyter-server-ydoc
nbclassic
notebook
notebook-shim
jinja2
] ++ lib.optionals (pythonOlder "3.11") [
tomli
Expand All @@ -68,10 +64,10 @@ buildPythonPackage rec {
];

meta = with lib; {
changelog = "https://github.com/jupyterlab/jupyterlab/releases/tag/v${version}";
changelog = "https://github.com/jupyterlab/jupyterlab/blob/v${version}/CHANGELOG.md";
description = "Jupyter lab environment notebook server extension";
license = with licenses; [ bsd3 ];
license = licenses.bsd3;
homepage = "https://jupyter.org/";
maintainers = with maintainers; [ zimbatm ];
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zimbatm Would you like to be a member of teams.jupyter?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not using jupyter, so probably best to remove me

maintainers = lib.teams.jupyter.members;
};
}
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/jupyterlab_server/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

buildPythonPackage rec {
pname = "jupyterlab_server";
version = "2.19.0";
version = "2.24.0";
format = "pyproject";

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
hash = "sha256-muwhohg7vt2fkahmKDVUSVdfGGLYiyitX5BQGdMebCE=";
hash = "sha256-Tm+Z4KVXm7vDLkScTbsDlWHU8aeCfVczJz7VZzjyHwc=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -77,6 +77,6 @@ buildPythonPackage rec {
homepage = "https://jupyterlab-server.readthedocs.io/";
changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ ];
maintainers = lib.teams.jupyter.members;
};
}
Loading