From b29f354db10618031282241204efcb4978feadb3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 28 Apr 2025 09:54:47 +0900 Subject: [PATCH 1/2] python312Packages.jupytext: 1.16.6 -> 1.17.1 Changelog: https://github.com/mwouts/jupytext/blob/v1.17.1/CHANGELOG.md --- pkgs/development/python-modules/jupytext/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 67a6b7cff3af..690ccb79cbcf 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -20,6 +20,7 @@ # tests jupyter-client, notebook, + pytest-asyncio, pytest-xdist, pytestCheckHook, versionCheckHook, @@ -27,14 +28,14 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.16.6"; + version = "1.17.1"; pyproject = true; src = fetchFromGitHub { owner = "mwouts"; repo = "jupytext"; tag = "v${version}"; - hash = "sha256-MkFTIHXpe0rYBJsaXwFqDEao+wSL2tG4JtPx1CjHGoY="; + hash = "sha256-Rkz2rite0hKcts4+3SmFsDF6tH2kQa4d2DtyZsAx3rA="; }; build-system = [ @@ -53,6 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ jupyter-client notebook + pytest-asyncio pytest-xdist pytestCheckHook versionCheckHook @@ -63,6 +65,10 @@ buildPythonPackage rec { # Tests that use a Jupyter notebook require $HOME to be writable export HOME=$(mktemp -d); export PATH=$out/bin:$PATH; + + substituteInPlace tests/functional/contents_manager/test_async_and_sync_contents_manager_are_in_sync.py \ + --replace-fail "from black import FileMode, format_str" "" \ + --replace-fail "format_str(sync_code, mode=FileMode())" "sync_code" ''; disabledTestPaths = [ From 654fc54c7357ab2e0a5ef4d9fbe1d92a3834ddb9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 28 Apr 2025 10:20:38 +0900 Subject: [PATCH 2/2] python312Packages.jupytext: enable jupyterlab extention --- .../python-modules/jupytext/default.nix | 27 +++++++++++++++++++ .../jupytext/missing-hashes.json | 12 +++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/jupytext/missing-hashes.json diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 690ccb79cbcf..cffbf7dab1e4 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -3,10 +3,13 @@ stdenv, buildPythonPackage, fetchFromGitHub, + nodejs, + yarn-berry_3, # build-system hatch-jupyter-builder, hatchling, + jupyterlab, # dependencies markdown-it-py, @@ -38,9 +41,33 @@ buildPythonPackage rec { hash = "sha256-Rkz2rite0hKcts4+3SmFsDF6tH2kQa4d2DtyZsAx3rA="; }; + nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + ]; + + missingHashes = ./missing-hashes.json; + + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit src missingHashes; + sourceRoot = "${src.name}/jupyterlab"; + hash = "sha256-UOsQsvnPpwpiKilaS0Rs/j1YReDljpLbEWZaeoRVK9g="; + }; + + env.HATCH_BUILD_HOOKS_ENABLE = true; + + preConfigure = '' + pushd jupyterlab + ''; + + preBuild = '' + popd + ''; + build-system = [ hatch-jupyter-builder hatchling + jupyterlab ]; dependencies = [ diff --git a/pkgs/development/python-modules/jupytext/missing-hashes.json b/pkgs/development/python-modules/jupytext/missing-hashes.json new file mode 100644 index 000000000000..363e4c54d983 --- /dev/null +++ b/pkgs/development/python-modules/jupytext/missing-hashes.json @@ -0,0 +1,12 @@ +{ + "@nx/nx-darwin-arm64@npm:16.10.0": "aabcc8499602b98c9fc3b768fe46dfd4e1b818caa84b740bd4f73a2e4528c719b979ecb1c10a0d793a1fead83073a08bc86417588046aa3e587e80af880bffd3", + "@nx/nx-darwin-x64@npm:16.10.0": "9dd20f45f646d05306f23f5abb7ade69dcb962e23a013101e93365847722079656d30a19c735fdcfa5c4e0fdf08691f9d621073c58aef2861c26741ff4638375", + "@nx/nx-freebsd-x64@npm:16.10.0": "35b93aabe3b3274d53157a6fc10fec7e341e75e6818e96cfbc89c3d5b955d225ca80a173630b6aa43c448c6b53b23f06a2699a25c0c8bc71396ee20a023d035f", + "@nx/nx-linux-arm-gnueabihf@npm:16.10.0": "697b9fa4c70f84d3ea8fe32d47635864f2e40b0ceeb1484126598c61851a2ec34b56bb3eeb9654c37d9b14e81ce85a36ac38946b4b90ca403c57fe448be51ccb", + "@nx/nx-linux-arm64-gnu@npm:16.10.0": "001e71fedfc763a4dedd6c5901b66a4a790d388673fb74675235e19bb8fe031ff3755568ed867513dd003f873901fabda31a7d5628b39095535cb9f6d1dc7191", + "@nx/nx-linux-arm64-musl@npm:16.10.0": "58e3b71571bdadd2b0ddd24ea6e30cd795e706ada69f685403412c518fba1a2011ac8c2ac46145eab14649aa5a78e0cedcdb4d327ccb3b6ec12e055171f3840b", + "@nx/nx-linux-x64-gnu@npm:16.10.0": "97729a7efb27301a67ebf34739784114528ddb54047e63ca110a985eaa0763c5b1ea7c623ead1a2266d07107951be81e82ffa0a30e6e4d97506659303f2c8c78", + "@nx/nx-linux-x64-musl@npm:16.10.0": "442bdbd5e61324a850e4e7bd6f54204108580299d3c7c4ebcec324da9a63e23f48d797a87593400fc32af78a3a03a3c104bfb360f107fe732e6a6c289863853a", + "@nx/nx-win32-arm64-msvc@npm:16.10.0": "b5c74184ebfc70294e85f8e309f81c3d40b5cf99068891e613f3bef5ddb946bef7c9942d9e6c7688e22006d45d786342359af3b4fc87aadf369afcda55c73187", + "@nx/nx-win32-x64-msvc@npm:16.10.0": "c5b174ebd7a5916246088e17d3761804b88f010b6b3f930034fa49af00da33b6d1352728c733024f736e4c2287def75bafdc3d60d8738bd24b67e9a4f11763f8" +}