linting

Author: bollwyvl

labextension/package.json

@@ -40,7 +40,8 @@
     "watch": "run-p watch:src watch:labextension",
     "watch:src": "jlpm build:lib -w --preserveWatchOutput",
     "watch:labextension": "jupyter labextension watch .",
-    "deduplicate": "yarn-deduplicate -s fewer --fail"
+    "deduplicate": "yarn-deduplicate -s fewer --fail",
+    "lint:prettier": "prettier --write --list-different \"../.github/*.yaml\" \"../*.{yaml,yml,md}\" \"../docs/**/*.md\" \"src/**/*.{tsx,ts}\""
   },
   "dependencies": {
     "@jupyterlab/application": "^2.0 || ^3.0 || ^4.0",
@@ -49,6 +50,7 @@
   "devDependencies": {
     "@jupyterlab/builder": "^4.0.6",
     "npm-run-all": "^4.1.5",
+    "prettier": "^3.0.3",
     "rimraf": "^5.0.1",
     "typescript": "~5.2.2",
     "yarn-berry-deduplicate": "^6.0.0"

labextension/src/index.ts

@@ -35,7 +35,7 @@ export const argSchema = {
 function newServerProxyWidget(
   id: string,
   url: string,
-  text: string
+  text: string,
 ): MainAreaWidget<IFrame> {
   const content = new IFrame({
     sandbox: [
@@ -67,15 +67,15 @@ async function activate(
   app: JupyterFrontEnd,
   labShell: ILabShell | null,
   launcher: ILauncher | null,
-  restorer: ILayoutRestorer | null
+  restorer: ILayoutRestorer | null,
 ): Promise<void> {
   const baseUrl = PageConfig.getBaseUrl();
   // Fetch configured server processes from {base_url}/server-proxy/servers-info
   const response = await fetch(`${baseUrl}server-proxy/servers-info`);
 
   if (!response.ok) {
     console.warn(
-      "Could not fetch metadata about registered servers. Make sure jupyter-server-proxy is installed."
+      "Could not fetch metadata about registered servers. Make sure jupyter-server-proxy is installed.",
     );
     console.warn(response);
     return;

labextension/yarn.lock

@@ -123,6 +123,7 @@ __metadata:
     "@jupyterlab/builder": ^4.0.6
     "@jupyterlab/launcher": ^2.0 || ^3.0 || ^4.0
     npm-run-all: ^4.1.5
+    prettier: ^3.0.3
     rimraf: ^5.0.1
     typescript: ~5.2.2
     yarn-berry-deduplicate: ^6.0.0
@@ -3350,6 +3351,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "prettier@npm:3.0.3"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
+  languageName: node
+  linkType: hard
+
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"

tests/acceptance/test_acceptance.py

@@ -11,6 +11,7 @@
 
 try:
     import notebook
+
     NOTEBOOK_VERSION = int(notebook.__version__.split(".")[0])
 except ImportError:
     NOTEBOOK_VERSION = None

tests/conftest.py

@@ -65,7 +65,7 @@ def a_server(
 
     # prepare an env
     env = dict(os.environ)
-    env.update(JUPYTER_TOKEN=a_token)
+    env.update(JUPYTER_TOKEN=a_token, JUPYTER_PLATFORM_DIRS="1")
 
     # start the process
     server_proc = Popen(args, cwd=str(tmp_path), env=env)
@@ -75,36 +75,39 @@ def a_server(
     canary_url = f"{url}favicon.ico"
     shutdown_url = f"{url}api/shutdown?token={a_token}"
 
-    retries = 10
+    wait_until_urlopen(canary_url)
+
+    print(f"{a_server_cmd} is ready...", flush=True)
+
+    yield url
+
+    # clean up after server is no longer needed
+    print(f"{a_server_cmd} shutting down...", flush=True)
+    wait_until_urlopen(shutdown_url, data=[])
+    server_proc.wait()
+    print(f"{a_server_cmd} is stopped", flush=True)
+
 
+def wait_until_urlopen(url, **kwargs):
+    retries = 10
     while retries:
+        time.sleep(1)
         try:
-            urlopen(canary_url)
+            urlopen(url, **kwargs)
             break
         except URLError:
             if not retries:
                 print(
-                    f"{a_server_cmd} not ready, aborting",
+                    f"{url} not ready, aborting",
                     flush=True,
                 )
                 raise
             print(
-                f"{a_server_cmd} not ready, will try again in 0.5s [{retries} retries]",
+                f"{url} not ready, will try again in 0.5s [{retries} retries]",
                 flush=True,
             )
-            time.sleep(0.5)
             retries -= 1
 
-    print(f"{a_server_cmd} is ready...", flush=True)
-
-    yield url
-
-    # clean up after server is no longer needed
-    print(f"{a_server_cmd} shutting down...", flush=True)
-    urlopen(shutdown_url, data=[])
-    server_proc.wait()
-    print(f"{a_server_cmd} is stopped", flush=True)
-
 
 @fixture
 def a_server_port_and_token(