diff --git a/docs/source/configuration.md b/docs/source/configuration.md index bfe0b144..6cb1f65c 100644 --- a/docs/source/configuration.md +++ b/docs/source/configuration.md @@ -27,5 +27,5 @@ jupyter lab --YDocExtension.file_poll_interval=2 jupyter lab --YDocExtension.document_cleanup_delay=100 # The YStore class to use for storing Y updates (default: JupyterSQLiteYStore). -jupyter lab --YDocExtension.ystore_class=ypy_websocket.ystore.TempFileYStore +jupyter lab --YDocExtension.ystore_class=pycrdt_websocket.ystore.TempFileYStore ``` diff --git a/jupyter_collaboration/app.py b/jupyter_collaboration/app.py index ff337460..c249d544 100644 --- a/jupyter_collaboration/app.py +++ b/jupyter_collaboration/app.py @@ -6,7 +6,7 @@ from jupyter_server.extension.application import ExtensionApp from traitlets import Bool, Float, Type -from ypy_websocket.ystore import BaseYStore +from pycrdt_websocket.ystore import BaseYStore from .handlers import DocSessionHandler, YDocWebSocketHandler from .loaders import FileLoaderMapping diff --git a/jupyter_collaboration/handlers.py b/jupyter_collaboration/handlers.py index 4f000041..9902be4e 100644 --- a/jupyter_collaboration/handlers.py +++ b/jupyter_collaboration/handlers.py @@ -14,9 +14,9 @@ from jupyter_ydoc import ydocs as YDOCS from tornado import web from tornado.websocket import WebSocketHandler -from ypy_websocket.websocket_server import YRoom -from ypy_websocket.ystore import BaseYStore -from ypy_websocket.yutils import YMessageType, write_var_uint +from pycrdt_websocket.websocket_server import YRoom +from pycrdt_websocket.ystore import BaseYStore +from pycrdt_websocket.yutils import YMessageType, write_var_uint from .loaders import FileLoaderMapping from .rooms import DocumentRoom, TransientRoom diff --git a/jupyter_collaboration/rooms.py b/jupyter_collaboration/rooms.py index 75e2a20e..543d664e 100644 --- a/jupyter_collaboration/rooms.py +++ b/jupyter_collaboration/rooms.py @@ -10,9 +10,9 @@ from jupyter_events import EventLogger from jupyter_ydoc import ydocs as YDOCS -from ypy_websocket.websocket_server import YRoom -from ypy_websocket.ystore import BaseYStore, YDocNotFound -from ypy_websocket.yutils import write_var_uint +from pycrdt_websocket.websocket_server import YRoom +from pycrdt_websocket.ystore import BaseYStore, YDocNotFound +from pycrdt_websocket.yutils import write_var_uint from .loaders import FileLoader from .utils import ( diff --git a/jupyter_collaboration/stores.py b/jupyter_collaboration/stores.py index 323e06ed..60c8df4a 100644 --- a/jupyter_collaboration/stores.py +++ b/jupyter_collaboration/stores.py @@ -3,8 +3,8 @@ from traitlets import Int, Unicode from traitlets.config import LoggingConfigurable -from ypy_websocket.ystore import SQLiteYStore as _SQLiteYStore -from ypy_websocket.ystore import TempFileYStore as _TempFileYStore +from pycrdt_websocket.ystore import SQLiteYStore as _SQLiteYStore +from pycrdt_websocket.ystore import TempFileYStore as _TempFileYStore class TempFileYStore(_TempFileYStore): diff --git a/jupyter_collaboration/websocketserver.py b/jupyter_collaboration/websocketserver.py index f35c1148..cfcaf2f5 100644 --- a/jupyter_collaboration/websocketserver.py +++ b/jupyter_collaboration/websocketserver.py @@ -8,8 +8,8 @@ from typing import Any from tornado.websocket import WebSocketHandler -from ypy_websocket.websocket_server import WebsocketServer, YRoom -from ypy_websocket.ystore import BaseYStore +from pycrdt_websocket.websocket_server import WebsocketServer, YRoom +from pycrdt_websocket.ystore import BaseYStore class RoomNotFound(LookupError): diff --git a/pyproject.toml b/pyproject.toml index f501a189..4335d01f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dependencies = [ "jupyter_server>=2.0.0,<3.0.0", "jupyter_ydoc>=1.1.0a0,<2.0.0", - "ypy-websocket>=0.12.1,<0.13.0", + "pycrdt-websocket>=0.12.5,<0.13.0", "jupyter_events>=0.7.0", "jupyter_server_fileid>=0.7.0,<1", "jsonschema>=4.18.0" diff --git a/tests/conftest.py b/tests/conftest.py index 234dbb3c..c10d9105 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -11,7 +11,7 @@ import pytest from jupyter_ydoc import YNotebook, YUnicode from websockets import connect -from ypy_websocket import WebsocketProvider +from pycrdt_websocket import WebsocketProvider from jupyter_collaboration.loaders import FileLoader from jupyter_collaboration.rooms import DocumentRoom diff --git a/tests/test_handlers.py b/tests/test_handlers.py index 0a8f7d08..dc6280c4 100644 --- a/tests/test_handlers.py +++ b/tests/test_handlers.py @@ -8,7 +8,7 @@ from typing import Any from jupyter_ydoc import YUnicode -from ypy_websocket import WebsocketProvider +from pycrdt_websocket import WebsocketProvider async def test_session_handler_should_create_session_id( diff --git a/tests/utils.py b/tests/utils.py index 199e152c..c25e3f29 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -7,7 +7,7 @@ from typing import Any from jupyter_server import _tz as tz -from ypy_websocket.yutils import write_var_uint +from pycrdt_websocket.yutils import write_var_uint from jupyter_collaboration.utils import RoomMessages