geojupyter · mfisher87 · Aug 5, 2025 · Aug 5, 2025 · Aug 5, 2025 · Sep 2, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -175,7 +175,7 @@ jobs:
         run: |
           set -eux
           cp ./jupytergis/dist/jupytergis*.whl ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl .
-          python -m pip install jupytergis*.whl "jupyter-collaboration>=3,<4" "jupyterlab==4.4.2"
+          python -m pip install jupytergis*.whl "jupyter-collaboration>=4" "jupyterlab==4.4.2"
 
       - name: Install
         shell: bash -l {0}

diff --git a/docs/environment.yml b/docs/environment.yml
@@ -14,7 +14,7 @@ dependencies:
   - sidecar
   - pip:
       - yjs-widgets>=0.4,<0.5
-      - my-jupyter-shared-drive<0.2.0
+      - my-jupyter-shared-drive>=0.2.0
       - ../python/jupytergis_lab
       - ../python/jupytergis_core
       - ../python/jupytergis_lite
diff --git a/lite/environment.yml b/lite/environment.yml
@@ -14,7 +14,7 @@ dependencies:
   - sidecar
   - pip:
       - yjs-widgets>=0.4,<0.5
-      - my-jupyter-shared-drive<0.2.0
+      - my-jupyter-shared-drive>=0.2.0
       - ../jupytergis_lab-0.0.1-py3-none-any.whl
       - ../jupytergis_core-0.0.1-py3-none-any.whl
       - ../jupytergis_lite-0.0.1-py3-none-any.whl
diff --git a/packages/base/package.json b/packages/base/package.json
@@ -41,7 +41,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": ">=0.2.6 <3.0.0",
-    "@jupyter/collaboration": "^3.1.0",
+    "@jupyter/collaboration": "^4.0.0",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
     "@jupytergis/schema": "^0.9.2",

diff --git a/python/jupytergis/pyproject.toml b/python/jupytergis/pyproject.toml
@@ -22,10 +22,10 @@ dependencies = [
   "jupytergis_core==0.9.2",
   "jupytergis_lab==0.9.2",
   "jupytergis_qgis==0.9.2",
-  "jupyter-collaboration>=3,<4",
-  "jupyter-docprovider>=1,<2",
-  "jupyter-server-ydoc>=1,<2",
-  "jupyter-collaboration-ui>=1,<2",
+  "jupyter-collaboration>=4",
+  "jupyter-docprovider>=2",
+  "jupyter-server-ydoc>=2",
+  "jupyter-collaboration-ui>=2",
   "jupyterlab>=4.3,<5",
 ]
 dynamic = ["version"]

diff --git a/python/jupytergis_core/package.json b/python/jupytergis_core/package.json
@@ -53,7 +53,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/collaborative-drive": "^4.0.0",
     "@jupytergis/base": "^0.9.2",
     "@jupytergis/schema": "^0.9.2",
     "@jupyterlab/application": "^4.3.0",

diff --git a/python/jupytergis_core/src/factory.ts b/python/jupytergis_core/src/factory.ts
@@ -1,4 +1,4 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import {
   JupyterGISPanel,
   JupyterGISDocumentWidget,
@@ -29,7 +29,7 @@ interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
   rendermime?: IRenderMimeRegistry;
   consoleTracker?: IConsoleTracker;
   backendCheck?: () => boolean;
-  drive?: ICollaborativeDrive | null;
+  drive?: ICollaborativeContentProvider | null;
   formSchemaRegistry: IJGISFormSchemaRegistry;
   state: IStateDB;
   annotationModel: IAnnotationModel;

diff --git a/python/jupytergis_core/src/jgisplugin/plugins.ts b/python/jupytergis_core/src/jgisplugin/plugins.ts
@@ -1,7 +1,4 @@
-import {
-  ICollaborativeDrive,
-  SharedDocumentFactory,
-} from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
 import {
   IAnnotationModel,
@@ -32,6 +29,7 @@ import { MimeDocumentFactory } from '@jupyterlab/docregistry';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { SharedDocumentFactory } from '@jupyterlab/services';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IStateDB } from '@jupyterlab/statedb';
 
@@ -60,7 +58,7 @@ const activate = async (
   state: IStateDB,
   launcher: ILauncher | null,
   palette: ICommandPalette | null,
-  drive: ICollaborativeDrive | null,
+  drive: ICollaborativeContentProvider | null,
 ): Promise<void> => {
   formSchemaRegistry && state;
   if (PageConfig.getOption('jgis_expose_maps')) {
@@ -273,7 +271,7 @@ const jGISPlugin: JupyterFrontEndPlugin<void> = {
     IJGISFormSchemaRegistryToken,
     IStateDB,
   ],
-  optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
+  optional: [ILauncher, ICommandPalette, ICollaborativeContentProvider],
   autoStart: true,
   activate,
 };

diff --git a/python/jupytergis_lab/package.json b/python/jupytergis_lab/package.json
@@ -52,7 +52,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/collaborative-drive": "^4.0.0",
     "@jupytergis/base": "^0.9.2",
     "@jupytergis/schema": "^0.9.2",
     "@jupyterlab/application": "^4.3.0",

diff --git a/python/jupytergis_lab/src/notebookrenderer.ts b/python/jupytergis_lab/src/notebookrenderer.ts
@@ -1,4 +1,4 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import {
   JupyterGISOutputWidget,
   JupyterGISPanel,
@@ -140,7 +140,7 @@ export const notebookRendererPlugin: JupyterFrontEndPlugin<void> = {
     IJGISExternalCommandRegistryToken,
     IJupyterGISDocTracker,
     IJupyterYWidgetManager,
-    ICollaborativeDrive,
+    ICollaborativeContentProvider,
     IStateDB,
     IAnnotationToken,
     ISettingRegistry,
@@ -151,7 +151,7 @@ export const notebookRendererPlugin: JupyterFrontEndPlugin<void> = {
     externalCommandRegistry?: IJGISExternalCommandRegistry,
     jgisTracker?: JupyterGISTracker,
     yWidgetManager?: IJupyterYWidgetManager,
-    drive?: ICollaborativeDrive,
+    drive?: ICollaborativeContentProvider,
     state?: IStateDB,
     annotationModel?: IAnnotationModel,
     settingRegistry?: ISettingRegistry,

diff --git a/python/jupytergis_lite/pyproject.toml b/python/jupytergis_lite/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = [
 dependencies = [
   "jupytergis_core==0.9.2",
   "jupytergis_lab==0.9.2",
-  "my-jupyter-shared-drive<0.2.0",
+  "my-jupyter-shared-drive>=0.2.0",
 ]
 dynamic = ["version"]
 license = {file = "LICENSE"}

diff --git a/python/jupytergis_qgis/package.json b/python/jupytergis_qgis/package.json
@@ -53,7 +53,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/collaborative-drive": "^4.0.0",
     "@jupytergis/base": "^0.9.2",
     "@jupytergis/jupytergis-core": "^0.9.2",
     "@jupytergis/schema": "^0.9.2",

diff --git a/python/jupytergis_qgis/src/plugins.ts b/python/jupytergis_qgis/src/plugins.ts
@@ -1,7 +1,4 @@
-import {
-  ICollaborativeDrive,
-  SharedDocumentFactory,
-} from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import {
   JupyterGISDocumentWidget,
   logoMiniIcon,
@@ -37,6 +34,7 @@ import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import { PathExt } from '@jupyterlab/coreutils';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { SharedDocumentFactory } from '@jupyterlab/services';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IStateDB } from '@jupyterlab/statedb';
 import { Widget } from '@lumino/widgets';
@@ -75,7 +73,7 @@ const activate = async (
   app: JupyterFrontEnd,
   tracker: WidgetTracker<IJupyterGISWidget>,
   themeManager: IThemeManager,
-  drive: ICollaborativeDrive,
+  drive: ICollaborativeContentProvider,
   externalCommandRegistry: IJGISExternalCommandRegistry,
   contentFactory: ConsolePanel.IContentFactory,
   editorServices: IEditorServices,
@@ -264,9 +262,11 @@ const activate = async (
 
         // Check if the file exists
         let fileExist = true;
-        await drive.get(absolutePath, { content: false }).catch(() => {
-          fileExist = false;
-        });
+        await app.serviceManager.contents
+          .get(absolutePath, { content: false })
+          .catch(() => {
+            fileExist = false;
+          });
         if (fileExist) {
           const overwrite = await showDialog({
             title: 'Export the project to QGZ file',
@@ -324,7 +324,7 @@ export const qgisplugin: JupyterFrontEndPlugin<void> = {
   requires: [
     IJupyterGISDocTracker,
     IThemeManager,
-    ICollaborativeDrive,
+    ICollaborativeContentProvider,
     IJGISExternalCommandRegistryToken,
     ConsolePanel.IContentFactory,
     IEditorServices,

diff --git a/requirements-build.txt b/requirements-build.txt
@@ -1,10 +1,10 @@
 # minimum needed to build jupytergis.
 datamodel-code-generator>=0.23.0
 hatchling>=1.5.0,<2
-jupyter-collaboration>=3,<4
-jupyter-collaboration-ui>=1,<2
-jupyter-docprovider>=1,<2
-jupyter-server-ydoc>=1,<2
+jupyter-collaboration>=4
+jupyter-collaboration-ui>=2
+jupyter-docprovider>=2
+jupyter-server-ydoc>=2
 jupyterlab>=4.3,<5
 mercantile>=1.2
 pillow>=10