gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #220400 from dotlambda/jupyterlab-fix

Browse Source 
python310Packages.jupyterlab: update dependencies
This commit is contained in:
Martin Weinelt
2023-03-10 00:48:52 +00:00
committed by GitHub
parent a07ee21495 17f04af85a
commit 84655541f1
7 changed files with 302 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/jupyter-server-fileid/default.nix
+54
View File
@@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, jupyter-events
, jupyter-server
, pytest-jupyter
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jupyter-server-fileid";
version = "0.8.0";
disables = pythonOlder "3.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "jupyter-server";
repo = "jupyter_server_fileid";
rev = "refs/tags/v${version}";
hash = "sha256-gJ+OM2b4JrdBObPnltqCWGK3e5p3K2XcoUohej3nDIM=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
jupyter-events
jupyter-server
];
pythonImportsCheck = [ "jupyter_server_fileid" ];
checkInputs = [
pytest-jupyter
pytestCheckHook
];
preCheck = ''
export HOME=$TEMPDIR
'';
meta = {
changelog = "https://github.com/jupyter-server/jupyter_server_fileid/blob/${src.rev}/CHANGELOG.md";
description = "An extension that maintains file IDs for documents in a running Jupyter Server";
homepage = "https://github.com/jupyter-server/jupyter_server_fileid";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/python-modules/jupyter-server-ydoc/default.nix
+60
View File
@@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, jupyter-server-fileid
, jupyter-ydoc
, ypy-websocket
, pytest-jupyter
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jupyter-server-ydoc";
version = "0.8.0";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "jupyterlab";
repo = "jupyter_collaboration";
rev = "refs/tags/v${version}";
hash = "sha256-KLb7kU5jsj6ihGO6HU3Y7uF+0PcwKoQlqQAhtO0oaJw=";
};
postPatch = ''
sed -i "/^timeout/d" pyproject.toml
'';
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
jupyter-server-fileid
jupyter-ydoc
ypy-websocket
];
pythonImportsCheck = [ "jupyter_server_ydoc" ];
nativeCheckInputs = [
pytest-jupyter
pytestCheckHook
];
preCheck = ''
export HOME=$TEMP
'';
meta = {
changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${src.rev}/CHANGELOG.md";
description = "A Jupyter Server Extension Providing Y Documents";
homepage = "https://github.com/jupyterlab/jupyter_collaboration";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/python-modules/jupyter-ydoc/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchPypi
, hatch-nodejs-version
, hatchling
, y-py
, pytestCheckHook
, websockets
, ypy-websocket
}:
buildPythonPackage rec {
pname = "jupyter-ydoc";
version = "0.3.4";
format = "pyproject";
src = fetchPypi {
pname = "jupyter_ydoc";
inherit version;
hash = "sha256-WiJi5wvwBLgsxs5xZ16TMKoFj+MNsuh82BJa1N0a5OE=";
};
nativeBuildInputs = [
hatch-nodejs-version
hatchling
];
propagatedBuildInputs = [
y-py
];
pythonImportsCheck = [ "jupyter_ydoc" ];
nativeCheckInputs = [
pytestCheckHook
websockets
ypy-websocket
];
# requires a Node.js environment
doCheck = false;
meta = {
changelog = "https://github.com/jupyter-server/jupyter_ydoc/blob/v${version}/CHANGELOG.md";
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 ];
};
}
pkgs/development/python-modules/jupyterlab/default.nix
+25 -1
View File
@@ -1,10 +1,19 @@
{ lib
, buildPythonPackage
, fetchPypi
, ipython
, packaging
, tornado
, jupyter-core
, jupyterlab_server
, jupyter-server
, jupyter-server-ydoc
, notebook
, jinja2
, tomli
, pythonOlder
, jupyter-packaging
, pythonRelaxDepsHook
, nbclassic
}:
@@ -22,12 +31,27 @@ buildPythonPackage rec {
nativeBuildInputs = [
jupyter-packaging
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"jupyter-ydoc"
"jupyter-server-ydoc"
];
propagatedBuildInputs = [
ipython
packaging
tornado
jupyter-core
jupyterlab_server
notebook
jupyter-server
jupyter-server-ydoc
nbclassic
notebook
jinja2
] ++ lib.optionals (pythonOlder "3.11") [
tomli
];
makeWrapperArgs = [
pkgs/development/python-modules/y-py/default.nix
+44
View File
@@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, rustPlatform
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "y-py";
version = "0.6.0";
format = "pyproject";
src = fetchPypi {
pname = "y_py";
inherit version;
hash = "sha256-RoNhaffcKVffhRPP5LwgCRdbOkc+Ywr0IajnXuHEj5g=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-tpUDGBIHqXsKPsK+1h2sNuiV2I0pGVBokKh+hdFazRQ=";
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
rust.cargo
rust.rustc
];
pythonImportsCheck = [ "y_py" ];
nativeCheckInputs = [
pytestCheckHook
];
meta = {
description = "Python bindings for Y-CRDT";
homepage = "https://github.com/y-crdt/ypy";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/python-modules/ypy-websocket/default.nix
+59
View File
@@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, aiofiles
, aiosqlite
, y-py
, pytest-asyncio
, pytestCheckHook
, websockets
}:
buildPythonPackage rec {
pname = "ypy-websocket";
version = "0.8.4";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "y-crdt";
repo = "ypy-websocket";
rev = "refs/tags/v${version}";
hash = "sha256-jl2ciIA3enJRfPgcu96MZN+BmNL+bBet54AFDBy3seY=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
aiofiles
aiosqlite
y-py
];
pythonImportsCheck = [ "ypy_websocket" ];
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
websockets
];
disabledTestPaths = [
# requires installing yjs Node.js module
"tests/test_ypy_yjs.py"
];
meta = {
changelog = "https://github.com/y-crdt/ypy-websocket/blob/${src.rev}/CHANGELOG.md";
description = "WebSocket Connector for Ypy";
homepage = "https://github.com/y-crdt/ypy-websocket";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/top-level/python-packages.nix
+9
View File
@@ -5095,8 +5095,13 @@ self: super: with self; {
jupyter-server = callPackage ../development/python-modules/jupyter-server { };
jupyter-server-fileid = callPackage ../development/python-modules/jupyter-server-fileid { };
jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };
jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { };
jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { };
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
@@ -12677,6 +12682,8 @@ self: super: with self; {
xyzservices = callPackage ../development/python-modules/xyzservices { };
y-py = callPackage ../development/python-modules/y-py { };
yabadaba = callPackage ../development/python-modules/yabadaba { };
yahooweather = callPackage ../development/python-modules/yahooweather { };
@@ -12761,6 +12768,8 @@ self: super: with self; {
yowsup = callPackage ../development/python-modules/yowsup { };
ypy-websocket = callPackage ../development/python-modules/ypy-websocket { };
yq = callPackage ../development/python-modules/yq {
inherit (pkgs) jq;
};