Revert jupyterlab#61

davidbrochart · Nov 22, 2022 · 9604799 · 9604799
1 parent 8534e23
commit 9604799
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/jupyter_server_ydoc/app.py b/jupyter_server_ydoc/app.py
@@ -6,7 +6,6 @@
 except ModuleNotFoundError:
     raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.")
 
-from jupyter_server.utils import url_path_join
 from traitlets import Float, Int, Type
 from ypy_websocket.ystore import BaseYStore  # type: ignore
 
@@ -63,9 +62,7 @@ def initialize_settings(self):
     def initialize_handlers(self):
         self.handlers.extend(
             [
-                url_path_join(
-                    self.settings["base_url"], (r"/api/yjs/roomid/(.*)", YDocRoomIdHandler)
-                ),
-                url_path_join(self.settings["base_url"], (r"/api/yjs/(.*)", YDocWebSocketHandler)),
+                (r"/api/yjs/roomid/(.*)", YDocRoomIdHandler),
+                (r"/api/yjs/(.*)", YDocWebSocketHandler),
             ]
         )
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,6 @@ requires-python = ">=3.7"
 dependencies = [
   "jupyter_ydoc>=0.2.0,<0.4.0",
   "ypy-websocket>=0.6.0,<0.7.0",
-  "jupyter_server>=1.15, <3",
   "jupyter_server_fileid >=0.6.0,<1"
 ]
 
@@ -41,7 +40,7 @@ Homepage = "https://jupyter.org"
 [project.optional-dependencies]
 test = [
   "coverage",
-  "jupyter_server[test]>=1.15, <3",
+  "jupyter_server[test]>=2.0.0a0",
   "pytest>=7.0",
   "pytest_tornasync",
   "pytest-cov",