From 9baffb46cf14c4bdfd61f2fcaa79781f5ce9f2d5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Jun 2026 17:05:35 +0000 Subject: [PATCH] python3Packages.jupytext: 1.18.1 -> 1.19.5 Diff: https://github.com/jupytext/jupytext/compare/v1.18.1...v1.19.4 Changelog: https://github.com/jupytext/jupytext/releases/tag/v1.19.4 --- .../python-modules/jupytext/default.nix | 42 ++++++-------- ...x-yarn-lock-typescript-offline-cache.patch | 58 ------------------- .../jupytext/fix-yarn-lock-typescript.patch | 58 ------------------- .../jupytext/missing-hashes.json | 14 ++++- 4 files changed, 32 insertions(+), 140 deletions(-) delete mode 100644 pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript-offline-cache.patch delete mode 100644 pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript.patch diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index e84ff2351ff3..4d8e4bfc144d 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -9,7 +9,7 @@ # build-system hatch-jupyter-builder, hatchling, - jupyterlab, + jupyter-builder, # dependencies markdown-it-py, @@ -29,36 +29,38 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupytext"; - version = "1.18.1"; + version = "1.19.5"; pyproject = true; src = fetchFromGitHub { owner = "mwouts"; repo = "jupytext"; - tag = "v${version}"; - hash = "sha256-D7Ps/lHF3F/7Jm4ozcjO8YsTPA1GQPqZVpPod/riGvA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+rNSp0CKW0ZTj8szwSJniCmBYuzGatVWo097jFWBkmI="; }; - patches = [ - ./fix-yarn-lock-typescript.patch - ]; + postPatch = '' + 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" + ''; nativeBuildInputs = [ nodejs yarn-berry_3.yarnBerryConfigHook ]; + # To generate: + # nix-shell -p yarn-berry_3.yarn-berry-fetcher --command \ + # "yarn-berry-fetcher missing-hashes "$(nix-build -A python3Packages.jupytext.src)/jupyterlab/yarn.lock" > pkgs/development/python-modules/jupytext/missing-hashes.json" missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_3.fetchYarnBerryDeps { - inherit src missingHashes; - patches = [ - ./fix-yarn-lock-typescript-offline-cache.patch - ]; - sourceRoot = "${src.name}/jupyterlab"; - hash = "sha256-k2lQnlSmCghIkp6VwNmq5KpSHS5tEbnFnsM+xqo3Ebw="; + inherit (finalAttrs) src missingHashes; + sourceRoot = "${finalAttrs.src.name}/jupyterlab"; + hash = "sha256-jyo7hbCYntZtpecK8cCoDOSgWT4xA+MaJu+e3N+aHUU="; }; env.HATCH_BUILD_HOOKS_ENABLE = true; @@ -74,7 +76,7 @@ buildPythonPackage rec { build-system = [ hatch-jupyter-builder hatchling - jupyterlab + jupyter-builder ]; dependencies = [ @@ -97,12 +99,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - preCheck = '' - 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 = [ # Requires the `git` python module "tests/external" @@ -125,9 +121,9 @@ buildPythonPackage rec { meta = { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; homepage = "https://github.com/mwouts/jupytext"; - changelog = "https://github.com/mwouts/jupytext/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/mwouts/jupytext/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; teams = [ lib.teams.jupyter ]; mainProgram = "jupytext"; }; -} +}) diff --git a/pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript-offline-cache.patch b/pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript-offline-cache.patch deleted file mode 100644 index 290c8f1679c9..000000000000 --- a/pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript-offline-cache.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock -index eb08ec21..b8cd1e79 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -7137,7 +7137,7 @@ __metadata: - jupyterlab-rise: ^0.43.1 - npm-run-all: ^4.1.5 - rimraf: ^6.0.1 -- typescript: ~5.8.2 -+ typescript: ~5.9.2 - languageName: unknown - linkType: soft - -@@ -10906,7 +10906,7 @@ __metadata: - languageName: node - linkType: hard - --"typescript@npm:>=3 < 6, typescript@npm:~5.8.2": -+"typescript@npm:>=3 < 6": - version: 5.8.2 - resolution: "typescript@npm:5.8.2" - bin: -@@ -10916,7 +10916,17 @@ __metadata: - languageName: node - linkType: hard - --"typescript@patch:typescript@>=3 < 6#~builtin, typescript@patch:typescript@~5.8.2#~builtin": -+"typescript@npm:~5.9.2": -+ version: 5.9.3 -+ resolution: "typescript@npm:5.9.3" -+ bin: -+ tsc: bin/tsc -+ tsserver: bin/tsserver -+ checksum: 0d0ffb84f2cd072c3e164c79a2e5a1a1f4f168e84cb2882ff8967b92afe1def6c2a91f6838fb58b168428f9458c57a2ba06a6737711fdd87a256bbe83e9a217f -+ languageName: node -+ linkType: hard -+ -+"typescript@patch:typescript@>=3 < 6#~builtin": - version: 5.8.2 - resolution: "typescript@patch:typescript@npm%3A5.8.2#~builtin::version=5.8.2&hash=5786d5" - bin: -@@ -10926,6 +10936,16 @@ __metadata: - languageName: node - linkType: hard - -+"typescript@patch:typescript@~5.9.2#~builtin": -+ version: 5.9.3 -+ resolution: "typescript@patch:typescript@npm%3A5.9.3#~builtin::version=5.9.3&hash=5786d5" -+ bin: -+ tsc: bin/tsc -+ tsserver: bin/tsserver -+ checksum: a5a6dc399d3761ded54192031f11d3ad5df8001c7febe3fbbc8098efcb552cdf8f2f402b3618c56dafcd04fef63dee005f4900f608e185404caedc46480539ed -+ languageName: node -+ linkType: hard -+ - "typestyle@npm:^2.0.4": - version: 2.4.0 - resolution: "typestyle@npm:2.4.0" diff --git a/pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript.patch b/pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript.patch deleted file mode 100644 index db83c083ec8b..000000000000 --- a/pkgs/development/python-modules/jupytext/fix-yarn-lock-typescript.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/jupyterlab/yarn.lock b/jupyterlab/yarn.lock -index eb08ec21..b8cd1e79 100644 ---- a/jupyterlab/yarn.lock -+++ b/jupyterlab/yarn.lock -@@ -7137,7 +7137,7 @@ __metadata: - jupyterlab-rise: ^0.43.1 - npm-run-all: ^4.1.5 - rimraf: ^6.0.1 -- typescript: ~5.8.2 -+ typescript: ~5.9.2 - languageName: unknown - linkType: soft - -@@ -10906,7 +10906,7 @@ __metadata: - languageName: node - linkType: hard - --"typescript@npm:>=3 < 6, typescript@npm:~5.8.2": -+"typescript@npm:>=3 < 6": - version: 5.8.2 - resolution: "typescript@npm:5.8.2" - bin: -@@ -10916,7 +10916,17 @@ __metadata: - languageName: node - linkType: hard - --"typescript@patch:typescript@>=3 < 6#~builtin, typescript@patch:typescript@~5.8.2#~builtin": -+"typescript@npm:~5.9.2": -+ version: 5.9.3 -+ resolution: "typescript@npm:5.9.3" -+ bin: -+ tsc: bin/tsc -+ tsserver: bin/tsserver -+ checksum: 0d0ffb84f2cd072c3e164c79a2e5a1a1f4f168e84cb2882ff8967b92afe1def6c2a91f6838fb58b168428f9458c57a2ba06a6737711fdd87a256bbe83e9a217f -+ languageName: node -+ linkType: hard -+ -+"typescript@patch:typescript@>=3 < 6#~builtin": - version: 5.8.2 - resolution: "typescript@patch:typescript@npm%3A5.8.2#~builtin::version=5.8.2&hash=5786d5" - bin: -@@ -10926,6 +10936,16 @@ __metadata: - languageName: node - linkType: hard - -+"typescript@patch:typescript@~5.9.2#~builtin": -+ version: 5.9.3 -+ resolution: "typescript@patch:typescript@npm%3A5.9.3#~builtin::version=5.9.3&hash=5786d5" -+ bin: -+ tsc: bin/tsc -+ tsserver: bin/tsserver -+ checksum: a5a6dc399d3761ded54192031f11d3ad5df8001c7febe3fbbc8098efcb552cdf8f2f402b3618c56dafcd04fef63dee005f4900f608e185404caedc46480539ed -+ languageName: node -+ linkType: hard -+ - "typestyle@npm:^2.0.4": - version: 2.4.0 - resolution: "typestyle@npm:2.4.0" diff --git a/pkgs/development/python-modules/jupytext/missing-hashes.json b/pkgs/development/python-modules/jupytext/missing-hashes.json index 363e4c54d983..7cd8b0f8eb36 100644 --- a/pkgs/development/python-modules/jupytext/missing-hashes.json +++ b/pkgs/development/python-modules/jupytext/missing-hashes.json @@ -8,5 +8,17 @@ "@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" + "@nx/nx-win32-x64-msvc@npm:16.10.0": "c5b174ebd7a5916246088e17d3761804b88f010b6b3f930034fa49af00da33b6d1352728c733024f736e4c2287def75bafdc3d60d8738bd24b67e9a4f11763f8", + "@rspack/binding-darwin-arm64@npm:2.1.2": "ea6a494a7799d29e0bfc4efc34ba04c0fa799c40f60007f66634af691ffe75c2b0273416b2b1a0db975e860eedbcac1a5f3a08f0dadbd3a7251d6ff93d819f4c", + "@rspack/binding-darwin-x64@npm:2.1.2": "4b603a16060259128914adb3ee6ce19c5b1e0e982da4f227589f5698f0696d42a9d6514b4e3923a617e3d02f358f4247550db71f30149b58557aa8f4483f7a0e", + "@rspack/binding-linux-arm64-gnu@npm:2.1.2": "e1403322a60d921189724cb8834ef9cd7bd6905c1503978f044364255535b3655510e5f6eba1f73807ec69c6cdf77a93ed23605182e0ce553e5b62287fbf7a73", + "@rspack/binding-linux-arm64-musl@npm:2.1.2": "1bffd6bc69f4df23009098831c0e61bcc0041733dfc6bc95fd47402d5df07fd183323ea42e5dbed3a8875242d9e4538805fdbfdd0adbb2ab7273eb14caac27d0", + "@rspack/binding-linux-riscv64-gnu@npm:2.1.2": "4fd50becc5496a876f17f40669354508d3ac63e9ab77b17c80b9e4188b8a84ebf7f9d66dc9c09f6d7417b6daed07e60d2b4fdfa7492bfe9e84972be9a70e93d9", + "@rspack/binding-linux-riscv64-musl@npm:2.1.2": "4821d418edbfefcfccee5dc8a638d5d7d37888b3ee7882c31bb6c1bd5406397ee301326482ea4b39e81a8b4f12956e6e89c2d1cacfc2a52b3ad053e44a4a90f1", + "@rspack/binding-linux-x64-gnu@npm:2.1.2": "dfd3b5663a275e7be243f2c2e031fa1d0d922e0f6b7e485d34a15ea0bed9f7c41a94c8c5a65da14890055d4d458218b0d6b1066a4992440cd2e13a583e4b674e", + "@rspack/binding-linux-x64-musl@npm:2.1.2": "fc7d9eb05c7ad3b0567a7c1c44fbd1b8bf0bc2804612db19c0632667bd5a839acd63f45a6e5faadc94c0deb54003e7e6d723602b985b6842a35a97ec4b24d02e", + "@rspack/binding-wasm32-wasi@npm:2.1.2": "ee24c13146b7f3150ec2b420e103a1678f43dcb151de0a5329576261b3026380858bdf04f1550a2c0a7b3d982ad8ffc24acee0c0cdc18871e8f32ad02f735aae", + "@rspack/binding-win32-arm64-msvc@npm:2.1.2": "df837beeec87070f64b75c24b58c7f05796379f5fdda3953919caa582a3639d726fff0f875554b6d239d9a3de910bb1306cb220d60fed5d7bca79ebc09eaf9d9", + "@rspack/binding-win32-ia32-msvc@npm:2.1.2": "f2672882e26bcc6401d5481d5beebc818267465b026370959a58e545de871aeebf689b5934f8fb9f17f213dc1831d2e866d8d87df1ca7595fac9753b05e5626d", + "@rspack/binding-win32-x64-msvc@npm:2.1.2": "98fcc2dc4bfbcbdfb975cadf0f583565cabf64fea222d07dc26432017bb4d5bae3153b503b596c9364de62c1be41a12ad2037ba8c90a52335d5549c93ad6b57a" }