jupyverse 0.4.2__tar.gz → 0.5.1__tar.gz

{jupyverse-0.4.2 → jupyverse-0.5.1}/.github/workflows/check-release.yml

@@ -47,7 +47,7 @@ jobs:
           pip install -e jupyverse_api
           pip install -e plugins/frontend
           pip install -e plugins/jupyterlab
-          pip install -e plugins/retrolab
+          pip install -e plugins/notebook
           pip install -e plugins/contents
           pip install -e plugins/kernels
           pip install -e plugins/terminals

{jupyverse-0.4.2 → jupyverse-0.5.1}/.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
         cache: 'pip'
     - name: Install hatch
       run: |
@@ -32,9 +32,9 @@ jobs:
         hatch run dev.jupyterlab-noauth:typecheck
         hatch run dev.jupyterlab-auth:typecheck
         hatch run dev.jupyterlab-auth_fief:typecheck
-        hatch run dev.retrolab-noauth:typecheck
-        hatch run dev.retrolab-auth:typecheck
-        hatch run dev.retrolab-auth_fief:typecheck
+        hatch run dev.notebook-noauth:typecheck
+        hatch run dev.notebook-auth:typecheck
+        hatch run dev.notebook-auth_fief:typecheck
 
   test:
     name: Tests
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ '3.8', '3.9', '3.10', '3.11' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
 
     steps:
     - name: Checkout

{jupyverse-0.4.2 → jupyverse-0.5.1}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: end-of-file-fixer
       - id: check-case-conflict
@@ -16,7 +16,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.9
+    rev: v0.4.1
     hooks:
       - id: ruff
         args: ["--fix"]

{jupyverse-0.4.2 → jupyverse-0.5.1}/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.5.1
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.0...4ddd9ab118c9ed47340d44b6eb57b68894b1bcc5))
+
+### Merged PRs
+
+- Check terminal websocket before removing it [#405](https://github.com/jupyter-server/jupyverse/pull/405) ([@davidbrochart](https://github.com/davidbrochart))
+- Update documentation URL [#404](https://github.com/jupyter-server/jupyverse/pull/404) ([@davidbrochart](https://github.com/davidbrochart))
+- Set watchfiles log level to WARNING [#403](https://github.com/jupyter-server/jupyverse/pull/403) ([@davidbrochart](https://github.com/davidbrochart))
+- Update ypywidgets v0.7.0 for tests [#400](https://github.com/jupyter-server/jupyverse/pull/400) ([@davidbrochart](https://github.com/davidbrochart))
+- Remove output trailing newline [#399](https://github.com/jupyter-server/jupyverse/pull/399) ([@davidbrochart](https://github.com/davidbrochart))
+- Save anonymous user info in database [#397](https://github.com/jupyter-server/jupyverse/pull/397) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2024-04-12&to=2024-04-29&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-04-12..2024-04-29&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-04-12..2024-04-29&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 0.5.0
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.4.2...66aac71cf07cbc14c5196cc1c144b9965fec7d2c))
+
+### Merged PRs
+
+- Replace RetroLab with Notebook [#396](https://github.com/jupyter-server/jupyverse/pull/396) ([@davidbrochart](https://github.com/davidbrochart))
+- Update FastAPI-Users v13.0.0 [#395](https://github.com/jupyter-server/jupyverse/pull/395) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2024-01-02&to=2024-04-12&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-01-02..2024-04-12&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-01-02..2024-04-12&type=Issues)
+
 ## 0.4.2
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.4.1...2f084c7c744bb2d2865bdad223c680eca5c8a2cb))
@@ -16,8 +52,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2023-12-18..2024-01-02&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2023-12-18..2024-01-02&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.4.1
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.4.0...8321cf2a280ebe5e4bb4b09571a5b11855db649a))

{jupyverse-0.4.2 → jupyverse-0.5.1}/CONTRIBUTING.md

@@ -6,7 +6,7 @@ cd plugins/auth       ; rm -rf dist && python setup.py sdist bdist_wheel ; cp di
 cd plugins/contents   ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
 cd plugins/lab        ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
 cd plugins/jupyterlab ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
-cd plugins/retrolab   ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
+cd plugins/notebook   ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
 cd plugins/kernels    ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
 cd plugins/nbconvert  ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..
 cd plugins/terminals  ; rm -rf dist && python setup.py sdist bdist_wheel ; cp dist/* ../../dist/ ; cd ../..

{jupyverse-0.4.2 → jupyverse-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: jupyverse
-Version: 0.4.2
+Version: 0.5.1
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
@@ -30,8 +30,8 @@ Provides-Extra: jupyterlab
 Requires-Dist: fps-jupyterlab<1,>=0.1.2; extra == 'jupyterlab'
 Provides-Extra: noauth
 Requires-Dist: fps-noauth<1,>=0.1.2; extra == 'noauth'
-Provides-Extra: retrolab
-Requires-Dist: fps-retrolab<1,>=0.1.2; extra == 'retrolab'
+Provides-Extra: notebook
+Requires-Dist: fps-notebook<1,>=0.1.2; extra == 'notebook'
 Provides-Extra: test
 Requires-Dist: httpx; extra == 'test'
 Requires-Dist: httpx-ws>=0.4.1; extra == 'test'
@@ -46,8 +46,8 @@ Requires-Dist: requests; extra == 'test'
 Requires-Dist: ruff>=0.1.2; extra == 'test'
 Requires-Dist: types-setuptools; extra == 'test'
 Requires-Dist: websockets; extra == 'test'
-Requires-Dist: ypywidgets-textual<0.3.0,>=0.2.2; extra == 'test'
-Requires-Dist: ypywidgets<0.7.0,>=0.6.4; extra == 'test'
+Requires-Dist: ypywidgets-textual<0.5.0,>=0.4.0; extra == 'test'
+Requires-Dist: ypywidgets<0.8.0,>=0.7.0; extra == 'test'
 Description-Content-Type: text/markdown
 
 [![Build Status](https://github.com/jupyter-server/jupyverse/workflows/test/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
@@ -57,10 +57,10 @@ Description-Content-Type: text/markdown
 A set of [Asphalt](https://asphalt.readthedocs.io) components implementing a Jupyter server.
 
 Try it online:
-- JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jlab)
-- RetroLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-rlab)
+- JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jupyterlab)
+- Jupyter Notebook frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-notebook)
 
-Documentation is available [here](https://davidbrochart.github.io/jupyverse).
+Documentation is available [here](https://jupyter-server.github.io/jupyverse).
 
 ## Motivation
 

{jupyverse-0.4.2 → jupyverse-0.5.1}/README.md

@@ -5,10 +5,10 @@
 A set of [Asphalt](https://asphalt.readthedocs.io) components implementing a Jupyter server.
 
 Try it online:
-- JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jlab)
-- RetroLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-rlab)
+- JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jupyterlab)
+- Jupyter Notebook frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-notebook)
 
-Documentation is available [here](https://davidbrochart.github.io/jupyverse).
+Documentation is available [here](https://jupyter-server.github.io/jupyverse).
 
 ## Motivation
 

jupyverse-0.5.1/binder/jupyter_notebook_config.py

@@ -0,0 +1,44 @@
+jupyverse_jupyterlab_command = " ".join(
+    [
+        "jupyverse",
+        "--set auth.mode=noauth",
+        "--set frontend.collaborative=true",
+        "--set frontend.base_url={base_url}jupyverse-jupyterlab/",
+        "--disable notebook",
+        "--port={port}",
+    ]
+    + [">jupyverse_jupyterlab.log 2>&1"]
+)
+
+
+jupyverse_notebook_command = " ".join(
+    [
+        "jupyverse",
+        "--set auth.mode=noauth",
+        "--set frontend.collaborative=true",
+        "--set frontend.base_url={base_url}jupyverse-notebook/",
+        "--disable jupyterlab",
+        "--port={port}",
+    ]
+    + [">jupyverse_notebook.log 2>&1"]
+)
+
+
+c.ServerProxy.servers = {
+    "jupyverse-jupyterlab": {
+        "command": ["/bin/bash", "-c", jupyverse_jupyterlab_command],
+        "timeout": 60,
+        "absolute_url": False,
+    },
+    "jupyverse-notebook": {
+        "command": ["/bin/bash", "-c", jupyverse_notebook_command],
+        "timeout": 60,
+        "absolute_url": False,
+    },
+}
+
+c.NotebookApp.default_url = "/jupyverse-jupyterlab"
+
+import logging
+
+c.NotebookApp.log_level = logging.DEBUG

{jupyverse-0.4.2 → jupyverse-0.5.1}/binder/postBuild

@@ -2,7 +2,7 @@
 
 python -m pip install -e plugins/lab
 python -m pip install -e plugins/jupyterlab
-python -m pip install -e plugins/retrolab
+python -m pip install -e plugins/notebook
 python -m pip install -e plugins/contents
 python -m pip install -e plugins/kernels
 python -m pip install -e plugins/terminals

{jupyverse-0.4.2 → jupyverse-0.5.1}/config.yaml

@@ -27,8 +27,8 @@ component:
     resource_usage:
       type: resource_usage
       track_cpu_percent: true
-    #retrolab:
-    #  type: retrolab
+    #notebook:
+    #  type: notebook
     terminals:
       type: terminals
     yjs:

{jupyverse-0.4.2 → jupyverse-0.5.1}/docs/install.md

@@ -1,4 +1,4 @@
-Jupyverse can be installed to run either [JupyterLab](https://jupyterlab.readthedocs.io) or [RetroLab](https://github.com/jupyterlab/retrolab).
+Jupyverse can be installed to run either [JupyterLab](https://jupyterlab.readthedocs.io) or [Jupyter Notebook](https://jupyter-notebook.readthedocs.io).
 
 ## With `pip`
 
@@ -6,9 +6,9 @@ For the JupyterLab frontend:
 ```bash
 pip install "jupyverse[jupyterlab,auth]"
 ```
-Or for the RetroLab frontend:
+Or for the Jupyter Notebook frontend:
 ```bash
-pip install "jupyverse[retrolab,auth]"
+pip install "jupyverse[notebook,auth]"
 ```
 
 ## With `micromamba`
@@ -27,9 +27,9 @@ For the JupyterLab frontend:
 ```bash
 micromamba install -c conda-forge jupyverse fps-jupyterlab fps-auth
 ```
-Or for the RetroLab frontend:
+Or for the Jupyter Notebook frontend:
 ```bash
-micromamba install -c conda-forge jupyverse fps-retrolab fps-auth
+micromamba install -c conda-forge jupyverse fps-notebook fps-auth
 ```
 
 ## Development install
@@ -69,9 +69,9 @@ Entering `hatch env show` will show the available environments:
 │ dev  │ virtual │ dev.jupyterlab-noauth    │ test     │ lint      │
 │      │         │ dev.jupyterlab-auth      │          │ test      │
 │      │         │ dev.jupyterlab-auth_fief │          │ typecheck │
-│      │         │ dev.retrolab-noauth      │          │           │
-│      │         │ dev.retrolab-auth        │          │           │
-│      │         │ dev.retrolab-auth_fief   │          │           │
+│      │         │ dev.notebook-noauth      │          │           │
+│      │         │ dev.notebook-auth        │          │           │
+│      │         │ dev.notebook-auth_fief   │          │           │
 └──────┴─────────┴──────────────────────────┴──────────┴───────────┘
 ```
 !!! note
@@ -80,7 +80,7 @@ Entering `hatch env show` will show the available environments:
     from your local repository. So you want to use the `dev` environment.
 
 Currently, the `dev` environment matrix consists of all combinations of frontends
-(`jupyterlab`, `retrolab`) and authentication methods (`noauth`, `auth`, `auth_fief`),
+(`jupyterlab`, `notebook`) and authentication methods (`noauth`, `auth`, `auth_fief`),
 which leads to six environments.
 
 A number of scripts are available in the `dev` environments. They can be

{jupyverse-0.4.2 → jupyverse-0.5.1}/docs/plugins/lab.md

@@ -1 +1 @@
-`fps-lab` implements everything that is common to JupyterLab and RetroLab.
+`fps-lab` implements everything that is common to JupyterLab and Jupyter Notebook.

jupyverse-0.5.1/docs/plugins/notebook.md

@@ -0,0 +1 @@
+`fps-notebook` implements the Notebook API.

{jupyverse-0.4.2 → jupyverse-0.5.1}/docs/usage/single_user.md

@@ -11,7 +11,7 @@ This is the default mode when launching Jupyverse, just enter in a terminal:
 jupyverse --open-browser
 # same as: jupyverse --set auth.mode=token --open-browser
 ```
-This should open a new window in a browser, and load JupyterLab or RetroLab, depending on the front-end you chose to install (see [Install](../../install)).
+This should open a new window in a browser, and load JupyterLab or Jupyter Notebook, depending on the front-end you chose to install (see [Install](../../install)).
 
 If you look at the terminal, you should see among other things:
 ```

jupyverse-0.5.1/jupyverse/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{jupyverse-0.4.2 → jupyverse-0.5.1}/jupyverse_api/jupyverse_api/__init__.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 
 from .app import App
 
-__version__ = "0.4.2"
+__version__ = "0.5.1"
 
 
 class Singleton(type):

{jupyverse-0.4.2 → jupyverse-0.5.1}/jupyverse_api/jupyverse_api/cli.py

@@ -1,9 +1,14 @@
+import sys
 from typing import List, Tuple
 
-import pkg_resources
 import rich_click as click
 from asphalt.core.cli import run
 
+if sys.version_info < (3, 10):
+    from importlib_metadata import entry_points
+else:
+    from importlib.metadata import entry_points
+
 
 @click.command()  # type: ignore
 @click.option(
@@ -72,7 +77,7 @@ def main(
 def get_config(disable: Tuple[str, ...]) -> str:
     jupyverse_components = [
         ep.name
-        for ep in pkg_resources.iter_entry_points(group="jupyverse.components")
+        for ep in entry_points(group="jupyverse.components")
         if ep.name not in disable
     ]
 

{jupyverse-0.4.2/jupyverse_api/jupyverse_api/retrolab → jupyverse-0.5.1/jupyverse_api/jupyverse_api/notebook}/__init__.py

@@ -10,40 +10,40 @@ from ..auth import Auth, User
 from ..lab import Lab
 
 
-class RetroLab(Router, ABC):
+class Notebook(Router, ABC):
     def __init__(self, app: App, auth: Auth, lab: Lab):
         super().__init__(app=app)
 
         router = APIRouter()
 
-        @router.get("/retro/tree", response_class=HTMLResponse)
+        @router.get("/tree", response_class=HTMLResponse)
         async def get_tree(
             user: User = Depends(auth.current_user()),
         ):
             return await self.get_tree(user)
 
-        @router.get("/retro/notebooks/{path:path}", response_class=HTMLResponse)
+        @router.get("/notebooks/{path:path}", response_class=HTMLResponse)
         async def get_notebook(
             path,
             user: User = Depends(auth.current_user()),
         ):
             return await self.get_notebook(path, user)
 
-        @router.get("/retro/edit/{path:path}", response_class=HTMLResponse)
+        @router.get("/edit/{path:path}", response_class=HTMLResponse)
         async def edit_file(
             path,
             user: User = Depends(auth.current_user()),
         ):
             return await self.edit_file(path, user)
 
-        @router.get("/retro/consoles/{path:path}", response_class=HTMLResponse)
+        @router.get("/consoles/{path:path}", response_class=HTMLResponse)
         async def get_console(
             path,
             user: User = Depends(auth.current_user()),
         ):
             return await self.get_console(path, user)
 
-        @router.get("/retro/terminals/{name}", response_class=HTMLResponse)
+        @router.get("/terminals/{name}", response_class=HTMLResponse)
         async def get_terminal(
             name: str,
             user: User = Depends(auth.current_user()),

{jupyverse-0.4.2 → jupyverse-0.5.1}/jupyverse_api/pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = [
+  "importlib_metadata >=3.6; python_version<'3.10'",
   "pydantic >=2,<3",
   "fastapi >=0.95.0,<1",
   "rich-click >=1.6.1,<2",

{jupyverse-0.4.2 → jupyverse-0.5.1}/mkdocs.yml

@@ -44,7 +44,7 @@ nav:
   - 'frontend': plugins/frontend.md
   - 'lab': plugins/lab.md
   - 'jupyterlab': plugins/jupyterlab.md
-  - 'retrolab': plugins/retrolab.md
+  - 'notebook': plugins/notebook.md
   - 'nbconvert': plugins/nbconvert.md
   - 'login': plugins/login.md
   - 'kernels': plugins/kernels.md

jupyverse-0.5.1/plugins/auth/fps_auth/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{jupyverse-0.4.2 → jupyverse-0.5.1}/plugins/auth/fps_auth/routes.py

@@ -72,6 +72,7 @@ def auth_factory(
             async def get_api_me(
                 permissions: Optional[str] = None,
                 user: UserRead = Depends(backend.current_user()),
+                update_user = Depends(backend.update_user),
             ):
                 checked_permissions: Dict[str, List[str]] = {}
                 if permissions is None:
@@ -96,6 +97,14 @@ def auth_factory(
                     moon = get_anonymous_username()
                     identity["name"] = f"Anonymous {moon}"
                     identity["display_name"] = f"Anonymous {moon}"
+                    identity["initials"] = f"A{moon[0]}"
+                    await update_user(
+                        dict(
+                            name=identity["name"],
+                            display_name=identity["display_name"],
+                            permissions=checked_permissions,
+                        )
+                    )
                 return {
                     "identity": identity,
                     "permissions": checked_permissions,

{jupyverse-0.4.2 → jupyverse-0.5.1}/plugins/auth/pyproject.toml

@@ -10,7 +10,7 @@ dynamic = ["version"]
 requires-python = ">=3.8"
 dependencies = [
     "aiosqlite",
-    "fastapi-users[sqlalchemy,oauth] >=12,<13",
+    "fastapi-users[sqlalchemy,oauth] >=13.0.0,<14.0.0",
     "jupyverse-api >=0.1.2,<1",
 ]
 

jupyverse-0.5.1/plugins/auth_fief/fps_auth_fief/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{jupyverse-0.4.2 → jupyverse-0.5.1}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.4.2"
+__version__ = "0.5.1"
 
 from .launch import launch  # noqa

jupyverse-0.5.1/plugins/contents/fps_contents/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{jupyverse-0.4.2 → jupyverse-0.5.1}/plugins/contents/fps_contents/fileid.py

@@ -9,7 +9,9 @@ from watchfiles import Change, awatch
 
 from jupyverse_api import Singleton
 
-logger = logging.getLogger("contents")
+contents_logger = logging.getLogger("contents")
+watchfiles_logger = logging.getLogger("watchfiles")
+watchfiles_logger.setLevel(logging.WARNING)
 
 
 class Watcher:
@@ -110,13 +112,13 @@ class FileIdManager(metaclass=Singleton):
                         changed_path_str = str(changed_path)
 
                         if change == Change.deleted:
-                            logger.debug("File %s was deleted", changed_path_str)
+                            contents_logger.debug("File %s was deleted", changed_path_str)
                             async with db.execute(
                                 "SELECT COUNT(*) FROM fileids WHERE path = ?", (changed_path_str,)
                             ) as cursor:
                                 if not (await cursor.fetchone())[0]:
                                     # path is not indexed, ignore
-                                    logger.debug(
+                                    contents_logger.debug(
                                         "File %s is not indexed, ignoring", changed_path_str
                                     )
                                     continue
@@ -125,12 +127,12 @@ class FileIdManager(metaclass=Singleton):
                                 db, changed_path_str, deleted_paths, added_paths, False
                             )
                         elif change == Change.added:
-                            logger.debug("File %s was added", changed_path_str)
+                            contents_logger.debug("File %s was added", changed_path_str)
                             await maybe_rename(
                                 db, changed_path_str, added_paths, deleted_paths, True
                             )
                         elif change == Change.modified:
-                            logger.debug("File %s was modified", changed_path_str)
+                            contents_logger.debug("File %s was modified", changed_path_str)
                             if changed_path_str == self.db_path:
                                 continue
                             async with db.execute(
@@ -138,7 +140,7 @@ class FileIdManager(metaclass=Singleton):
                             ) as cursor:
                                 if not (await cursor.fetchone())[0]:
                                     # path is not indexed, ignore
-                                    logger.debug(
+                                    contents_logger.debug(
                                         "File %s is not indexed, ignoring", changed_path_str
                                     )
                                     continue
@@ -149,7 +151,7 @@ class FileIdManager(metaclass=Singleton):
                             )
 
                     for path in deleted_paths - added_paths:
-                        logger.debug("Unindexing file %s ", path)
+                        contents_logger.debug("Unindexing file %s ", path)
                         await db.execute("DELETE FROM fileids WHERE path = ?", (path,))
                     await db.commit()
 
@@ -203,7 +205,7 @@ async def maybe_rename(
             path1, path2 = changed_path, other_path
             if is_added_path:
                 path1, path2 = path2, path1
-            logger.debug("File %s was renamed to %s", path1, path2)
+            contents_logger.debug("File %s was renamed to %s", path1, path2)
             await db.execute("UPDATE fileids SET path = ? WHERE path = ?", (path2, path1))
             other_paths.remove(other_path)
             return

jupyverse-0.5.1/plugins/frontend/fps_frontend/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

jupyverse-0.5.1/plugins/jupyterlab/fps_jupyterlab/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{jupyverse-0.4.2 → jupyverse-0.5.1}/plugins/jupyterlab/fps_jupyterlab/routes.py

@@ -34,7 +34,7 @@ class _JupyterLab(JupyterLab):
         lab.redirect_after_root = "lab"
 
         extensions_dir = lab.prefix_dir / "share" / "jupyter" / "labextensions"
-        self.federated_extensions, self.disabled_extension = lab.get_federated_extensions(
+        self.federated_extensions, self.disabled_extensions = lab.get_federated_extensions(
             extensions_dir
         )
         jupyterlab_dir = Path(jupyterlab_module.__file__).parents[1]
@@ -126,7 +126,7 @@ class _JupyterLab(JupyterLab):
             "collaborative": collaborative,
             "serverSideExecution": server_side_execution,
             "devMode": dev_mode,
-            "disabledExtensions": self.disabled_extension,
+            "disabledExtensions": self.disabled_extensions,
             "exposeAppInBrowser": False,
             "extraLabextensionsPath": [],
             "federated_extensions": self.federated_extensions,

jupyverse-0.5.1/plugins/kernels/fps_kernels/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"

{jupyverse-0.4.2 → jupyverse-0.5.1}/plugins/kernels/fps_kernels/kernel_driver/driver.py

@@ -223,6 +223,9 @@ class KernelDriver:
         if msg_type == "stream":
             with outputs.doc.transaction():
                 # TODO: uncomment when changes are made in jupyter-ydoc
+                text = content["text"]
+                if text.endswith((os.linesep, "\n")):
+                    text = text[:-1]
                 if (not outputs) or (outputs[-1]["name"] != content["name"]):  # type: ignore
                     outputs.append(
                         #Map(
@@ -235,13 +238,13 @@ class KernelDriver:
                         {
                             "name": content["name"],
                             "output_type": msg_type,
-                            "text": [content["text"]],
+                            "text": [text],
                         }
                     )
                 else:
                     #outputs[-1]["text"].append(content["text"])  # type: ignore
                     last_output = outputs[-1]
-                    last_output["text"].append(content["text"])  # type: ignore
+                    last_output["text"].append(text)  # type: ignore
                     outputs[-1] = last_output
         elif msg_type in ("display_data", "execute_result"):
             if "application/vnd.jupyter.ywidget-view+json" in content["data"]:

jupyverse-0.5.1/plugins/lab/README.md

@@ -0,0 +1,3 @@
+# fps-lab
+
+An FPS plugin for the JupyterLab/Notebook API.

jupyverse-0.5.1/plugins/lab/fps_lab/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.1"