Depend on pycrdt instead of pycrdt_websocket

Author: brichet

jupyter_ydoc/ybasedoc.py

@@ -4,8 +4,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Callable, Dict, Optional
 
-from pycrdt import Doc, Map, Subscription, UndoManager
-from pycrdt_websocket.awareness import Awareness
+from pycrdt import Awareness, Doc, Map, Subscription, UndoManager
 
 
 class YBaseDoc(ABC):

jupyter_ydoc/yblob.py

@@ -4,8 +4,7 @@
 from functools import partial
 from typing import Any, Callable, Optional
 
-from pycrdt import Doc, Map
-from pycrdt_websocket.awareness import Awareness
+from pycrdt import Awareness, Doc, Map
 
 from .ybasedoc import YBaseDoc
 

jupyter_ydoc/ynotebook.py

@@ -6,8 +6,7 @@
 from typing import Any, Callable, Dict, Optional
 from uuid import uuid4
 
-from pycrdt import Array, Doc, Map, Text
-from pycrdt_websocket.awareness import Awareness
+from pycrdt import Array, Awareness, Doc, Map, Text
 
 from .utils import cast_all
 from .ybasedoc import YBaseDoc

jupyter_ydoc/yunicode.py

@@ -4,8 +4,7 @@
 from functools import partial
 from typing import Any, Callable, Optional
 
-from pycrdt import Doc, Text
-from pycrdt_websocket.awareness import Awareness
+from pycrdt import Awareness, Doc, Text
 
 from .ybasedoc import YBaseDoc
 

pyproject.toml

@@ -13,7 +13,7 @@ requires-python = ">=3.8"
 keywords = ["jupyter", "pycrdt", "yjs"]
 dependencies = [
     "importlib_metadata >=3.6; python_version<'3.10'",
-    "pycrdt >=0.9.0,<0.10.0",
+    "pycrdt >=0.9.16,<0.10.0",
 ]
 
 [[project.authors]]
@@ -28,7 +28,7 @@ dev = [
 ]
 test = [
     "pre-commit",
-    "pytest",
+    "pytest >=9.16",
     "pytest-asyncio",
     "websockets >=10.0",
     "pycrdt-websocket >=0.14.1,<0.15.0",

tests/test_ydocs.py

@@ -1,7 +1,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from pycrdt_websocket.awareness import Awareness
+from pycrdt import Awareness
 
 from jupyter_ydoc import YBlob, YNotebook