Upgrade fps v0.5.2

Author: davidbrochart

jupyverse_api/jupyverse_api/cli.py

@@ -84,6 +84,18 @@
     type=str,
     help="Disable plugin.",
 )
+@click.option(
+    "--timeout",
+    type=float,
+    default=None,
+    help="The timeout for starting Jupyverse.",
+)
+@click.option(
+    "--stop-timeout",
+    type=float,
+    default=1,
+    help="The timeout for stopping Jupyverse.",
+)
 def main(
     debug: bool = False,
     show_config: bool = False,
@@ -96,6 +108,8 @@ def main(
     disable: tuple[str, ...] = (),
     allow_origin: tuple[str, ...] = (),
     query_param: tuple[str, ...] = (),
+    timeout: float | None = None,
+    stop_timeout: float = 1,
 ) -> None:
     query_params_dict = {}
     for qp in query_param:
@@ -118,6 +132,8 @@ def main(
         show_config=show_config,
         help_all=help_all,
         backend=backend,
+        timeout=timeout,
+        stop_timeout=stop_timeout,
     )  # type: ignore
 
 

jupyverse_api/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "importlib_metadata >=3.6; python_version<'3.10'",
   "pydantic >=2,<3",
   "fastapi >=0.95.0,<1",
-  "fps >=0.5.1,<0.6.0",
+  "fps >=0.5.2,<0.6.0",
   "anyio >=3.6.2,<5",
   "anyioutils >=0.7.4",
 ]

plugins/environments/tests/test_environments.py

@@ -52,7 +52,9 @@ async def test_kernel_environment(tmp_path):
         }
     }
 
-    async with get_root_module(config) as root_module:
+    root_module = get_root_module(config)
+    root_module._global_start_timeout = 10
+    async with root_module as root_module:
         environments = await root_module.get(Environments)
         app = root_module.app
         transport = httpx.ASGITransport(app=app)

pyproject.toml

@@ -9,7 +9,7 @@ description = "A set of FPS plugins implementing a Jupyter server"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
-    "fps[click,fastapi,anycorn] >=0.5.1,<0.6.0",
+    "fps[click,fastapi,anycorn] >=0.5.2,<0.6.0",
     "fps-contents >=0.10.2,<0.11.0",
     "fps-environments >=0.1.0,<0.2.0",
     "fps-environment-micromamba >=0.1.0,<0.2.0",

tests/conftest.py

@@ -50,6 +50,8 @@ def start_jupyverse(auth_mode, clear_users, cwd, unused_tcp_port):
         "kernels.require_yjs=true",
         "--port",
         str(unused_tcp_port),
+        "--timeout",
+        "10",
     ]
     p = subprocess.Popen(command_list)
     url = f"http://127.0.0.1:{unused_tcp_port}"