Rebase 3.x onto main up to v3.1.0 #439

andrii-i · 2025-02-11T02:36:20Z

Problem

The v3 branch is not up to date with the latest 3.x release 3.1.0. It is instead at commit 046b463 "Publish 2.0.0alpha4".

This is blocking any backporting from main to 3.x, in particular:

Solution

Rebase 3.x onto main up to v3.1.0.

Alternative simpler option would be to hard reset 3.x to v3.1.0 47305e4 but then any history / commits that are part of 3.x and are not part of main up to 47305e4 would be lost.

Fixes Update v3 branch #436

* Remove packageManager entry * Fix for Python 3.12 * Remove use of pytest-asyncio * Fix mypy * Re-enable Python 3.11 * Don't test win/py3.12 * Fix URLs in package.json * Update yarn.lock * Revert previous commit * Remove pip --pre

SHA256 hashes: jupyter-collaboration-2.0.0.tgz: 182590721bf73d69c283d1a02ce291a4973f53257dd43d1981d63b79dcb375de jupyter-collaboration-extension-2.0.0.tgz: 2bff3a3214f232e8118ac692d2dea59706776c8dde744f68d05398b3ab3a6cbd jupyter-docprovider-2.0.0.tgz: 4572d0aeab0072e574c54c963363e2837340e99f632a791f8f968cebddcd9566 jupyter_collaboration-2.0.0-py3-none-any.whl: 222e66344ac2298dd677cbb030b5ec1215a79b8da04ee2ec01df7dd4dc6ec8ab jupyter_collaboration-2.0.0.tar.gz: eed21d0977045f074f80ee47c678c094f19c81567602d50a7ad858ab18a9958f

SHA256 hashes: jupyter-collaboration-2.0.1.tgz: 6231532bc9fec8e9b2f8232a80d0d4ccb5cc16a4425dab78739a3688de69e37f jupyter-collaboration-extension-2.0.1.tgz: 714b987ada7c0486b0e2f7ea0c916d7b2c905c552550514e4aa1287f14b4d31c jupyter-docprovider-2.0.1.tgz: d11c70eafea43c230e27d08722ff7e0af921cc493d536d72b3eed7929b1ed89c jupyter_collaboration-2.0.1-py3-none-any.whl: a9807a856c7aa341f529869cefed62273e9c2cf17f422be3556ae5c01accd57c jupyter_collaboration-2.0.1.tar.gz: 51ce7b93185a8ff0d08b9717fa48d5e0f1917056f15a6cdcf81db8f3ed550182

SHA256 hashes: jupyter-collaboration-2.0.2.tgz: 95bceff1013d7cab5781d30a607b96585acc62cdec01512591792d244ac34d52 jupyter-collaboration-extension-2.0.2.tgz: 138444d2102005104fef65884b7762be60d740e3d1ce4a47f6a34ffbf5113a46 jupyter-docprovider-2.0.2.tgz: 9c2812847d4e3296c50cf7aa04397782c26fadd8a9d7ff3a6739857127f41cd4 jupyter_collaboration-2.0.2-py3-none-any.whl: f620280c36e77411f470479e4f687348eed6dbdecd46acc6bd6ca326e145183d jupyter_collaboration-2.0.2.tar.gz: 129585b155828bfe883ae33fce03c87abddaacc0c68cf3f1866fed642e1a8e2e

* Fix cancellation of file save operation * Add comment about _maybe_save_document's cancellation

SHA256 hashes: jupyter-collaboration-2.0.3.tgz: 75b6cfe3ceccd367558cfb314a2530105e2034501c614cfe9f49c563834d7fa0 jupyter-collaboration-extension-2.0.3.tgz: b089c35efebbd052b937e3d106ce29bae3ca2a389fabb33bd558bd4f86da5c41 jupyter-docprovider-2.0.3.tgz: a38b0764f80ab82e649b372b04f040a85fddbee8070d69f131fca0af8cc9fc1a jupyter_collaboration-2.0.3-py3-none-any.whl: c55aa4a84419bf4bdddcbc683bdb0c6ef43b05623f295516a6f1e9f85aaddebe jupyter_collaboration-2.0.3.tar.gz: 3ed73cdec3d908c07a82acabddc37f2dbda27f9a6cdbd690040acb7ba0ad50c2

Co-authored-by: Jialin Zhang <[email protected]>

SHA256 hashes: jupyter-collaboration-2.0.4.tgz: 3d799919232f6c49b502c4e13d4a23b778f4c0b2feef5f9b88d8033dfbf3f5bf jupyter-collaboration-extension-2.0.4.tgz: 27f6f750982b3c4c35dd07a8d89b4ac4026bb08054321d873dfbc2515abcd63c jupyter-docprovider-2.0.4.tgz: 60dd03962b04e8cbddde62ff1e5c7d1c788af935024592c5954fcfa89c550935 jupyter_collaboration-2.0.4-py3-none-any.whl: ad2e7b867f63fa2b6189755c4f78b0c57ee7598855bab6c5e1b881e552e5efc8 jupyter_collaboration-2.0.4.tar.gz: dcddf0e892744876b51180440ff694d60d085fd9c31dfe22b1e18fc042b5ce9c

* Add test for document dirty attribute * Add rtc_document_save_delay fixture

SHA256 hashes: jupyter-collaboration-2.0.5.tgz: 73ab706fc160b39d8ae211bbaf6c84f48017aed3664237efd9da54b998c19b01 jupyter-collaboration-extension-2.0.5.tgz: 8522d995d01ce6b6d4ad6dac7aabec04daaa70d7e1ba0e36a0fbadf75a974e6a jupyter-docprovider-2.0.5.tgz: c6cabcbeb0fef7592744500d3d95192af091805373c2dd67ba8a8f409b65fc48 jupyter_collaboration-2.0.5-py3-none-any.whl: 935767df8917e532699509c7c09b305a56f2d9439144bf3b7a6e9fc8dbd152ea jupyter_collaboration-2.0.5.tar.gz: 6906191a2c9aec4ddb9705645b1eb0d876f6334bffcfd74e314ef61065b86828

…b#259) Co-authored-by: Jialin Zhang <[email protected]>

* Fix slow room opening * Add fix

SHA256 hashes: jupyter-collaboration-2.0.6.tgz: 7da0d11114ca5eeeedeccfa3a865ff89f099bfbd9afcad250685c0826a267344 jupyter-collaboration-extension-2.0.6.tgz: 2964d67b576cc4ea70a4a08fc94e160c07849bb3c7414e1165f73fe3967c139b jupyter-docprovider-2.0.6.tgz: 9d85c8f4b4c6bfb19bfdf93622a61d6c9b57a33ad25b5c3222dd4dbc824e7c47 jupyter_collaboration-2.0.6-py3-none-any.whl: 6a4d68e53a00495e2f1e283f044500aab91d63ffc6fa32e7da3e00ffe4fee075 jupyter_collaboration-2.0.6.tar.gz: aa47b45fb7f87c73fd8196e8a4bb68785e31aa50e8768c3e3c74f1c5d870b485

SHA256 hashes: jupyter-collaboration-2.0.7.tgz: 056f7d32016af019abe2414a9eee3db3cf595f1345345a96f86ac196477ba5fb jupyter-collaboration-extension-2.0.7.tgz: 0d13c36c8fc1185a668004a4f67a4b2af151b9fa45fabf2aed7f74cf549ac8b8 jupyter-docprovider-2.0.7.tgz: 3a79acfffd8090a968ef46f2fe00a57ae38f0041667279546f233af18b042e23 jupyter_collaboration-2.0.7-py3-none-any.whl: aaeadb48fa0b2ffb6e60a7b24032c9e3995801c85a7c46a856f210aa8ac96528 jupyter_collaboration-2.0.7.tar.gz: 475621557ed94e7fc862d2c248e322e62d950bb21f6678765a5059d7dc1525ac

SHA256 hashes: jupyter-collaboration-2.0.8.tgz: 70c758a1e59c53666d64940593f496930112154c4016782bd1e61cab187903c4 jupyter-collaboration-extension-2.0.8.tgz: 9685a989a8b11c97fd14609453af3ca5dac3967560ac97d11814cac47d89d5e6 jupyter-docprovider-2.0.8.tgz: 6b1eb6195c719613ce4804cebc28af187f7cff625de8ae329a4c7cff323e001a jupyter_collaboration-2.0.8-py3-none-any.whl: ced01f7da146e7eb8865e1152eb7bd6fcf56183827f9382a216ba94e02df44d5 jupyter_collaboration-2.0.8.tar.gz: 6f7e121833319061f312c69918bd9cc026e04b0b52dd4e1ab1e5b17e79d5bb10

SHA256 hashes: jupyter-collaboration-2.0.9.tgz: 3b34688c38bc93c9b3f9b2778a19e90c078ddb02925bf42c4bbe78fec21847eb jupyter-collaboration-extension-2.0.9.tgz: dc0f86741c1ed37165ad57794ec54bc7044b8194f1decccff931f8354a31eef9 jupyter-docprovider-2.0.9.tgz: 6ac74acef5ed51e537c6e58c55d8220178152c7702a612360f526de9588b3021 jupyter_collaboration-2.0.9-py3-none-any.whl: 8e122502e35204ff024bf33686d7afe7f04cfb001b1a1c960dfb07cbc9fc5a1e jupyter_collaboration-2.0.9.tar.gz: 53f1c9c7f8a9d1cd484ac2b7fcfd57ba2b7dba3381ca5d655ac5879279a0692c

SHA256 hashes: jupyter-collaboration-2.0.10.tgz: 1511d633e12d0db591af689fc5764e6b34b7ba3c402fa83e5e21db1ca996e340 jupyter-collaboration-extension-2.0.10.tgz: fad36e7021bbfaa77cec2fc8129335c723b30e3078390fccbfeedc9380617726 jupyter-docprovider-2.0.10.tgz: 8d75dbcadbd1792f58a6cef4b089557b02b3729e24f6b49064df8d801d54f6f1 jupyter_collaboration-2.0.10-py3-none-any.whl: 4a3d157e4299a43a28b40e4e5c6ff9c690d35f48f444d37f04e61b72da7d9093 jupyter_collaboration-2.0.10.tar.gz: 6d3fd6206d931a2a812b4bb84ceee4e67da7a6d03c3bdf27c6e23e7e422eed8a

SHA256 hashes: jupyter-collaboration-2.0.11.tgz: 9cd79f4cb98f0fa9daef9517ddfdc5a8469344be9b751ce9d788e9266b226e70 jupyter-collaboration-extension-2.0.11.tgz: d310361e0a184ed11fb7e62e2dce66949562e4278a9c8026bbe5db6a138dfb1f jupyter-docprovider-2.0.11.tgz: 9edb5cfaf74c582fdddc206a176a74df32adf08253a7f460d74e147a29a4e6b5 jupyter_collaboration-2.0.11-py3-none-any.whl: 4a23a01571375ae6cd0201dadc4f26919a6ddd6a71b28e11a25dc00bf105caa5 jupyter_collaboration-2.0.11.tar.gz: 2bb1cde72cda758e526fa49f9ff2bf402ceed7801c0c4187abe4d21e42e18136

* Upgrade galata to lab 4.1 Fix lockfile * Use `jp-button` instead of button * Be more explicit with test checking for "user menu with 2 items" (it is not!); because in lab 4.1 the DOM hierarchy changed (toolbar is now using shadow DOM), instead select the things which are of interest using precise selectors * Update snapshots * Update two more snapshots, switch serial assertions to soft * Fix `Create a notebook` test

* Initialize and update the ydoc path's property when it change * Update the path only instead of loading the document * linting and typing * Add test * Remove the test on path until package versions are fixed * linting

…pyterlab#353) * Extract out ICollaborativeDrive to @jupyter/collaborativedrive * Rename @jupyter/collaborativedrive to @jupyter/collaborative-drive * Move packages/collaborativedrive -> packages/collaborative-drive * Update collaborative-drive dependencies * Add collaborative-drive as shared package --------- Co-authored-by: Jeremy Tuloup <[email protected]>

SHA256 hashes: jupyter-collaboration-3.0.0-beta.7.tgz: 6ed6a69dd591d28b6e56585e84bbee918a8b26bab853eb35541430c15a6f0392 jupyter-collaboration-extension-3.0.0-beta.7.tgz: 60379c8b736ffce7242956ec76a07ae3113c612977e603e832fa9bbbc7543095 jupyter-collaborative-drive-3.0.0-beta.7.tgz: d57b6c982bad87e83cf06910de6e3afacf94b1ce08b9fd7c194e57b59e5f064d jupyter-docprovider-3.0.0-beta.7.tgz: 6a40fc7881b76f35fceeb314a878ce5ca337ee3889f11f066de0c9788015f72c jupyter-docprovider-extension-3.0.0-beta.7.tgz: 98a436d2ef833a0f955297ed33bc0a3a501fff6fcc61bd20129bd129bc4f977e jupyter_collaboration-3.0.0b7-py3-none-any.whl: 252492e31a33e21e23c666f8efb58744846c70a3486884695645055762e4c36e jupyter_collaboration-3.0.0b7.tar.gz: e1d6bbeeb7c23b88b60ef29d3b08a6e586b78a9dfdf5ee9ba4ff188370b99be4 jupyter_collaboration_ui-1.0.0b7-py3-none-any.whl: e956cdc98248ad2d1e1fa8fcc1dc21dd8d40b0a4d65351a4b228d43bb8ab8a38 jupyter_collaboration_ui-1.0.0b7.tar.gz: ab760cd7db1d3e14ec9dfaf688912f51ae6d4a151c1255cf2fb90da60a871cc9 jupyter_docprovider-1.0.0b7-py3-none-any.whl: 42a803233ba7b442d1dfcf0cb54c7cbd20107bfb56f41a7d1678074c8451f882 jupyter_docprovider-1.0.0b7.tar.gz: e314a58d217f238dafb58fdecb30fdb87563bd9dfc1fd74cc7c1f49fc453dd41 jupyter_server_ydoc-1.0.0b7-py3-none-any.whl: d7add5d06bbe6814bb1a19b0032e192b71fd4a4344b959c20e4d028905e61668 jupyter_server_ydoc-1.0.0b7.tar.gz: 5c310d827e50ffc1dc8a432c52e77b2ae1a22422036025304f7c54bb344176bc

SHA256 hashes: jupyter-collaboration-3.0.0-beta.8.tgz: 55c08c51abad8944329a0b724e2769f7fb4146e1aaa983b293d3c60c65b88545 jupyter-collaboration-extension-3.0.0-beta.8.tgz: 6b9dc48ff4d2df5eabebbac1e39aa4b3c6bd6b9a6beec4be828a7fd43eaf226a jupyter-collaborative-drive-3.0.0-beta.8.tgz: a3694b9838c3134ba7bf2aa46c3b99491d537cd5a98e05b0e58f2c2215728f28 jupyter-docprovider-3.0.0-beta.8.tgz: c87ab9facdc760837a035cde2f4a8e7412fb451618ae27861abb844d7ddb48f1 jupyter-docprovider-extension-3.0.0-beta.8.tgz: c7f9d2acfeb80cdd2d9f51dbfe98a0d9c86fb373ebbfc1e82ac4cb9fa531397e jupyter_collaboration-3.0.0b8-py3-none-any.whl: 6839b6a5ebe39cfc20e68789041c517379623a6f73af128f63a1ab7cc489b40a jupyter_collaboration-3.0.0b8.tar.gz: 64c55c1fd549b53796aec2922886b371f007c823cc70191c5a0037a61f3ce846 jupyter_collaboration_ui-1.0.0b8-py3-none-any.whl: 58ecd0c3ec61f107ac1af6d21c77804f14024dd9cb8cf407478a57ee4747c3c7 jupyter_collaboration_ui-1.0.0b8.tar.gz: 6db2c6fee75334289d29473364f5925b736b4832c0a7ac5ffcee008592f13004 jupyter_docprovider-1.0.0b8-py3-none-any.whl: 1b791e416347b1bdde4d672c763894d5535c96e334d6bd7ae0ab4628806fd614 jupyter_docprovider-1.0.0b8.tar.gz: 1c49f6c392836d57fe16a19daba5470e9606d9ac3c9d22bc6ffebfdd85fa53dc jupyter_server_ydoc-1.0.0b8-py3-none-any.whl: d4d12a2e4fd5de0096567e0bbc2ef187bf5bfb9733c740e6a46496563cb9b9d6 jupyter_server_ydoc-1.0.0b8.tar.gz: b3032706afa1b66b49d5d76fc686ee3fbc550747f6b3dabf5590cc746e836cca

* Fix dependencies * fix bump file * lint * Temporary skip check-python from releaser checks

* Update CI * Add dev install script * Automatic application of license header * Add update snapshots workflow * Update snapshots --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Add forking API (jupyterlab#394) * Add forking API * Add GET forks of root * Add fork Jupyter events * Replace query parameter merge=1 with merge=true * Add fork title and description * Add js api (jupyterlab#395) * Add forking API (jupyterlab#394) * Add forking API * Add GET forks of root * Add fork Jupyter events * Replace query parameter merge=1 with merge=true * Add fork title and description * Add JS APIs --------- Co-authored-by: David Brochart <[email protected]> * Fix test_fork_handler * again * Allow time for update to propagate --------- Co-authored-by: David Brochart <[email protected]>

* Provide a widget that can be used in a collaborative document to display current users * Automatic application of license header * Move the widget to collaboration package * Add style and allow empty model (for notebook panel for example) * Send the document model to the iconRenderer, and avoid displaying cursor on Anonymous icons * Improve the default icon renderer - allow the default renderer to receive additional classes - rename it for consistency - avoid sending non related props to div element * CSS * lint --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Update event schema version type * Tweak maxDiffPixelRatio * Set maxDiffPixelRatio to 0.001 Co-authored-by: Duc Trung Le <[email protected]> * Set maxDiffPixelRatio to 0.01 --------- Co-authored-by: Duc Trung Le <[email protected]>

* Use content providers (v2) Co-authored-by: davidbrochart <[email protected]> * Reduce the diff * Rewrite logic which used to rely on RTC prefix, cleanup * Update to JupyterLab v4.4.0a2 * Align TypeScript version with JupyterLab, re-enable lib check * Fix TypeScript tests * Bump JupyterLab version used in CI tests * Bump JupyterLab installed with `dev_install` * Fix "Test Minimum Versions" job * Run UI tests on 4.4.0a2 or newer * Expect the copied link to not have `RTC:` prefix * Set awareness for user regardless of RTC prefix * Match any file, not only files starting with letters * Fix opening collaborator's file (remove no-longer needed RTC prefix) --------- Co-authored-by: davidbrochart <[email protected]>

…ion (jupyterlab#427)

SHA256 hashes: jupyter-collaboration-4.0.0-alpha.0.tgz: 7ac5b87a5f32f5c32025a97f8da174c7cc8c620365fa4cdef514cb5af69c9b5c jupyter-collaboration-extension-4.0.0-alpha.0.tgz: dde0b0b196f2c693c16f0fa6e5bf2e20131c0e9e2ccd755e563473144888eab8 jupyter-collaborative-drive-4.0.0-alpha.0.tgz: 83cecf91bd3495c5f86d7ef9da108e1de48b46a4f38df32e92bb77171dea92b2 jupyter-docprovider-4.0.0-alpha.0.tgz: edc5040a364585d137310baf6e84374dc7a13510bf67dd69dd437e9ba1da4349 jupyter-docprovider-extension-4.0.0-alpha.0.tgz: 82406ba422b3520e49b41522a3003ae56d989bdb1adecd7d5d435b98eadd22d2 jupyter_collaboration-4.0.0a0-py3-none-any.whl: 2b69410844584cc968abb152e4483ebc6484f86fdb85a44c09920825055c0cc2 jupyter_collaboration-4.0.0a0.tar.gz: bc1abbf0ce1f2b232e642756a1bc0787a2d648c66b758eb8dc221ea1a387882f jupyter_collaboration_ui-2.0.0a0-py3-none-any.whl: f8fd1e03f55e64c1e28412edbd5ffb1c91b2d0fda4cf3db78ad8c8b891351a6b jupyter_collaboration_ui-2.0.0a0.tar.gz: 03d3e48c00b74ba02fb14c6dcefeffb9dc7f1e0a2797ae00e3982191b5ae120b jupyter_docprovider-2.0.0a0-py3-none-any.whl: 95f23681202bd65e9154892ba0fe6740c7afb3e0baa8b5345285d955e194519b jupyter_docprovider-2.0.0a0.tar.gz: e111b9fbdec31de2d7ab6b3ad6c8f006d666d1b5ced1d42d9baf5fc29602f019 jupyter_server_ydoc-2.0.0a0-py3-none-any.whl: 39c31b597c9b5daf356e301042b7bb6da494757e83331c06ad8d8d41fa31f2a6 jupyter_server_ydoc-2.0.0a0.tar.gz: c68771c85fdf97cfbe3f7e95e7b43eb9215b7d949ee36050ee22664bb1969cb2

…#422) * fix * change set -> map * make pre-commit hook happy

…upyterlab#423) * bug * timeline displayed for documents other than notebooks. * timeline displayed for documents other than notebooks. * remove rtc * remove check for path * suggested changes. * pre-commit

…on` package (jupyterlab#429) * pin jupyterlab at >=4.4.0,<5.0.0 * Update projects/jupyter-server-ydoc/pyproject.toml Co-authored-by: David L. Qiu <[email protected]> * pin jupyterlab at >=4.4.0a2,<5.0.0 in jupyter-collaboration subpackage --------- Co-authored-by: David L. Qiu <[email protected]>

SHA256 hashes: jupyter-collaboration-4.0.0-beta.0.tgz: c15a27674a282a9a56b8869e363ce25ebac13e8b9bb50e53c2a725c50a2d61f7 jupyter-collaboration-extension-4.0.0-beta.0.tgz: e403b7cc69263a494783cef0ae10ac7a3047e9cdb01d3334fa18cf5c22251b5f jupyter-collaborative-drive-4.0.0-beta.0.tgz: e6f29847c4e209bb767d998641d3040cec7d7ac5275e4a8c0273aa723e1013b4 jupyter-docprovider-4.0.0-beta.0.tgz: 90c74aca1a3c7c4e0fbf9ea567ab2abfd64949be3fa57d2ccace8ec5bc1397a6 jupyter-docprovider-extension-4.0.0-beta.0.tgz: 421b2eba73243a65725e9f1a61cb3f95507d2ac3910f1f91e1fd2d873b237f94 jupyter_collaboration-4.0.0b0-py3-none-any.whl: 7a8222e2443b572852f9a2ceed39e322fbac9cb26095e140ca46d62ba3b489db jupyter_collaboration-4.0.0b0.tar.gz: d6b291b1918147da64c8ec7d15bc6d0734f7a0fa41379c6f3c536645fb241865 jupyter_collaboration_ui-2.0.0b0-py3-none-any.whl: 99a48b7647aff4315da7f0e8f53b936d349227d7cabe354ce1a7f0c95a566f78 jupyter_collaboration_ui-2.0.0b0.tar.gz: 5a65ac8f37bcaf8a46465705b19d74364e674cda3c72a78b430091f85ab339bd jupyter_docprovider-2.0.0b0-py3-none-any.whl: 2c1991ca5280afdc4de705d843fffa952c6c8ecc67c1e2e4f8ac3f3a86b82e98 jupyter_docprovider-2.0.0b0.tar.gz: 3ac4a50dfa8613c3d0b85828b33aae219fa177d781df73f4a720bcff63a99098 jupyter_server_ydoc-2.0.0b0-py3-none-any.whl: 3d5980f0cdde0d49d10e5f6580e5c56df3085f7f73a4b200f5c77158625a56d2 jupyter_server_ydoc-2.0.0b0.tar.gz: bba4ac0a6a21b508aebff737b15916f39a83b90f3ee1b273ae03fd77b051a87f

github-actions · 2025-02-11T02:36:32Z

👈 Launch a Binder on branch andrii-i/jupyter-collaboration/rebase-3.x

brichet · 2025-02-11T08:30:37Z

Thanks @andrii-i for opening this.

Is this expected that it includes commits that bumps version to 4.0.0X ?

I wonder if we should not hard reset the branch to 47305e4, as you suggested in zulip chat, and then backport the relevant PRs to 3.x branch.

krassowski · 2025-02-11T09:16:22Z

I wonder if we should not hard reset the branch to 47305e4,

I think this is the right approach. Or put simply, remove* the 3.x branch and recreate it from that commit.

*we could rename it to 3.x-broken

andrii-i · 2025-02-11T19:01:44Z

Then next steps seem to be:

Rename current 3.x to 3.x-broken
Create new 3.x branch from main up to 47305e4 3.1.0 release commit

andrii-i · 2025-02-12T11:12:58Z

Ok done. 3.x is now up to date.

Closing this PR as superseded by manual creation of new 3.x from main.

brichet · 2025-02-12T11:35:43Z

Thanks @andrii-i

1reverseengineer and others added 30 commits February 10, 2025 18:26

Update README.md (jupyterlab#212)

64c7baf

Fix CI (jupyterlab#221)

6d4ccde

* Remove packageManager entry * Fix for Python 3.12 * Remove use of pytest-asyncio * Fix mypy * Re-enable Python 3.11 * Don't test win/py3.12 * Fix URLs in package.json * Update yarn.lock * Revert previous commit * Remove pip --pre

Use pycrdt-websocket instead of ypy-websocket (jupyterlab#220)

f4d23d6

Revert PR jupyterlab#170 (jupyterlab#228)

21f5c3b

Fix file saving (jupyterlab#231)

070f320

Handle last_modified only in FileLoader (jupyterlab#232)

58e413d

Call get with options of type IFetchOptions (jupyterlab#238)

65a056c

Fix cancellation of file save operation (jupyterlab#241)

8ec342a

* Fix cancellation of file save operation * Add comment about _maybe_save_document's cancellation

adding awareness event when open and close websockets (jupyterlab#246)

e6e6857

Co-authored-by: Jialin Zhang <[email protected]>

Bump jupyter_events (jupyterlab#258)

cabd087

Add test for document dirty attribute (jupyterlab#251)

75631be

* Add test for document dirty attribute * Add rtc_document_save_delay fixture

Fix concurrent room initialization (jupyterlab#255)

07214c3

make user name hover show up faster and margin area larger (jupyterla…

3b1686d

…b#259) Co-authored-by: Jialin Zhang <[email protected]>

Fix slow room opening (jupyterlab#264)

10638d2

* Fix slow room opening * Add fix

Update Release Scripts (jupyterlab#267)

3cb540e

Use WebSocket _room_id attribute (jupyterlab#266)

e472ed5

Fix releaser (jupyterlab#268)

b59b096

brichet and others added 16 commits February 10, 2025 18:31

Initialize and update the ydoc path property (jupyterlab#342)

cd8a279

* Initialize and update the ydoc path's property when it change * Update the path only instead of loading the document * linting and typing * Add test * Remove the test on path until package versions are fixed * linting

Fix bump file (jupyterlab#343)

b365b54

* Fix dependencies * fix bump file * lint * Temporary skip check-python from releaser checks

Update CI (jupyterlab#396)

fa118f0

* Update CI * Add dev install script * Automatic application of license header * Add update snapshots workflow * Update snapshots --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Update event schema version type (jupyterlab#421)

f475fc2

* Update event schema version type * Tweak maxDiffPixelRatio * Set maxDiffPixelRatio to 0.001 Co-authored-by: Duc Trung Le <[email protected]> * Set maxDiffPixelRatio to 0.01 --------- Co-authored-by: Duc Trung Le <[email protected]>

Fix Collaborator panel breaking on opening files without known extens…

5e88474

…ion (jupyterlab#427)

Fix duplicate collaborator entries in collaboration panel (jupyterlab…

b4acf1f

…#422) * fix * change set -> map * make pre-commit hook happy

Fix Timeline Slider Visibility in Status Bar for Certain Documents (j…

aff5b80

…upyterlab#423) * bug * timeline displayed for documents other than notebooks. * timeline displayed for documents other than notebooks. * remove rtc * remove check for path * suggested changes. * pre-commit

andrii-i added the bug Something isn't working label Feb 11, 2025

This was referenced Feb 11, 2025

Update v3 branch #436

Closed

Users item toolbar #379

Merged

update yarn.lock

1a07305

andrii-i added maintenance and removed bug Something isn't working labels Feb 11, 2025

andrii-i closed this Feb 12, 2025

andrii-i deleted the rebase-3.x branch February 12, 2025 11:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rebase 3.x onto main up to v3.1.0 #439

Rebase 3.x onto main up to v3.1.0 #439

Uh oh!

andrii-i commented Feb 11, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Feb 11, 2025

Uh oh!

brichet commented Feb 11, 2025

Uh oh!

krassowski commented Feb 11, 2025 •

edited

Loading

Uh oh!

andrii-i commented Feb 11, 2025 •

edited

Loading

Uh oh!

andrii-i commented Feb 12, 2025

Uh oh!

brichet commented Feb 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

Uh oh!

Rebase 3.x onto main up to v3.1.0 #439

Rebase 3.x onto main up to v3.1.0 #439

Uh oh!

Conversation

andrii-i commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Uh oh!

github-actions bot commented Feb 11, 2025

Uh oh!

brichet commented Feb 11, 2025

Uh oh!

krassowski commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrii-i commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrii-i commented Feb 12, 2025

Uh oh!

brichet commented Feb 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

andrii-i commented Feb 11, 2025 •

edited

Loading

krassowski commented Feb 11, 2025 •

edited

Loading

andrii-i commented Feb 11, 2025 •

edited

Loading