From bc0bfd94662df01adf2208c8daeb9e812d236f14 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 16 Jan 2025 14:12:47 +0100 Subject: [PATCH 1/4] Move jupyter-collaboration dependency to jupytergis --- python/jupytergis/pyproject.toml | 1 + python/jupytergis_core/pyproject.toml | 1 - python/jupytergis_lab/pyproject.toml | 1 - python/jupytergis_qgis/pyproject.toml | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/python/jupytergis/pyproject.toml b/python/jupytergis/pyproject.toml index d0613ab08..55041200c 100644 --- a/python/jupytergis/pyproject.toml +++ b/python/jupytergis/pyproject.toml @@ -22,6 +22,7 @@ dependencies = [ "jupytergis_core>=0.1.0,<1", "jupytergis_lab>=0.1.0,<1", "jupytergis_qgis>=0.1.0,<1", + "jupyter-collaboration>=3,<4", ] dynamic = ["version"] license = {file = "LICENSE"} diff --git a/python/jupytergis_core/pyproject.toml b/python/jupytergis_core/pyproject.toml index 772b86bf3..7c516249d 100644 --- a/python/jupytergis_core/pyproject.toml +++ b/python/jupytergis_core/pyproject.toml @@ -20,7 +20,6 @@ classifiers = [ ] dependencies = [ "jupyter-ydoc>=2,<3", - "jupyter-collaboration>=3,<4", ] dynamic = ["version", "description", "authors", "urls", "keywords"] license = {file = "LICENSE"} diff --git a/python/jupytergis_lab/pyproject.toml b/python/jupytergis_lab/pyproject.toml index c4a03e25f..aa116a00b 100644 --- a/python/jupytergis_lab/pyproject.toml +++ b/python/jupytergis_lab/pyproject.toml @@ -28,7 +28,6 @@ dependencies = [ "jupyter_server>=2.0.1,<3", "jupyter-ydoc>=2,<3", "jupyterlab>=4.3,<5", - "jupyter-collaboration>=3,<4", "ypywidgets>=0.9.0,<0.10.0", "yjs-widgets>=0.3.5,<0.4", "comm>=0.1.2,<0.2.0", diff --git a/python/jupytergis_qgis/pyproject.toml b/python/jupytergis_qgis/pyproject.toml index 15a2b5454..a1d6e1457 100644 --- a/python/jupytergis_qgis/pyproject.toml +++ b/python/jupytergis_qgis/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ dependencies = [ "jupyter_server>=2.0.1,<3", "jupyter-ydoc>=2,<3", - "jupyter-collaboration>=3,<4", "jupytergis_lab" ] dynamic = ["version", "description", "authors", "urls", "keywords"] From 90d201bcb94f06187b9e5bfa8b1ec0f9e9d2e1f3 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 16 Jan 2025 14:27:22 +0100 Subject: [PATCH 2/4] Install jupyter-collaboration in tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d88ff0c5..b21b791e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,7 +173,7 @@ jobs: run: | set -eux cp ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl . - python -m pip install jupytergis*.whl + python -m pip install jupytergis*.whl "jupyter-collaboration>=3,<4" - name: Install dependencies shell: bash -l {0} From 10339c4e63bec0deeff3719d68bbba685c0ec4c5 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 16 Jan 2025 14:30:47 +0100 Subject: [PATCH 3/4] And in build requirements --- requirements-build.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-build.txt b/requirements-build.txt index 48a1c1303..2156f241c 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -2,6 +2,7 @@ datamodel-code-generator>=0.23.0 hatchling>=1.5.0,<2 jupyterlab>=4,<5 +jupyter-collaboration>=3,<4 mercantile>=1.2 pillow>=10 pydantic>=2.4.2,<3 From c20ecfec0a658ea17c042ed866c74b64893d0a49 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:31:14 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- requirements-build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-build.txt b/requirements-build.txt index 2156f241c..853853fcf 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -1,8 +1,8 @@ # minimum needed to build jupytergis. datamodel-code-generator>=0.23.0 hatchling>=1.5.0,<2 -jupyterlab>=4,<5 jupyter-collaboration>=3,<4 +jupyterlab>=4,<5 mercantile>=1.2 pillow>=10 pydantic>=2.4.2,<3