Skip to content

Move jupyter-collaboration dependency to jupytergis #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinRenou merged 5 commits into from
Jan 16, 2025
Merged

Move jupyter-collaboration dependency to jupytergis #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc0bfd9
Move jupyter-collaboration dependency to jupytergis
davidbrochart Jan 16, 2025
ff2b361
Merge remote-tracking branch 'upstream/main' into collaboration
davidbrochart Jan 16, 2025
90d201b
Install jupyter-collaboration in tests
davidbrochart Jan 16, 2025
10339c4
And in build requirements
davidbrochart Jan 16, 2025
c20ecfe
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions python/jupytergis/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
1 change: 0 additions & 1 deletion python/jupytergis_core/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ classifiers = [
]
dependencies = [
"jupyter-ydoc>=2,<3",
"jupyter-collaboration>=3,<4",
Copy link
Member

@martinRenou martinRenou Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use extras instead?

Technically, this break jupytergis-core, right?

Copy link
Collaborator Author

@davidbrochart davidbrochart Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, this break jupytergis-core, right?

Does jupytergis-core use jupyter-collaboration specifically?

Copy link
Member

@martinRenou martinRenou Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it provides the labextension for opening JupyterGIS files in JupyterLab

Copy link
Collaborator Author

@davidbrochart davidbrochart Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it just needs an ICollaborativeDrive, right?

Copy link
Member

@martinRenou martinRenou Jan 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then someone needs to provide it. If we remove the jupyter-collaboration dep from jupytergis-core, nobody provides collaboration support when we just do:

pip install jupytergis-core

Copy link
Collaborator Author

@davidbrochart davidbrochart Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is the goal of this PR, so that someone can provide their own collaboration system (other than jupyter-collaboration).
Since the jupyter-collaboration was moved to jupytergis you still get it on a default installation.

Copy link
Member

@martinRenou martinRenou Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Yeah I guess it's not possible to do that using extras...

]
dynamic = ["version", "description", "authors", "urls", "keywords"]
license = {file = "LICENSE"}
Expand Down
1 change: 0 additions & 1 deletion python/jupytergis_lab/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion python/jupytergis_qgis/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
1 change: 1 addition & 0 deletions requirements-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# minimum needed to build jupytergis.
datamodel-code-generator>=0.23.0
hatchling>=1.5.0,<2
jupyter-collaboration>=3,<4
jupyterlab>=4,<5
mercantile>=1.2
pillow>=10
Expand Down
Loading