Merge pull request #647 from bollwyvl/gh-644-retro

Start RetroLab support

Author: minrk

.binder/jupyter_config.json

@@ -0,0 +1,5 @@
+{
+  "LabApp": {
+    "collaborative": true
+  }
+}

.binder/postBuild

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+jlpm --prefer-offline --ignore-optional --ignore-scripts
+
+jlpm build
+
+IPP_DISABLE_JS=1 python -m pip install -e .[test,benchmark]
+
+jupyter serverextension enable --sys-prefix --py ipyparallel
+jupyter serverextension list
+
+jupyter server extension enable --sys-prefix --py ipyparallel
+jupyter server extension list
+
+jupyter nbextension install --symlink --sys-prefix --py ipyparallel
+jupyter nbextension enable --sys-prefix --py ipyparallel
+jupyter nbextension list
+
+jlpm install:extension
+jupyter labextension list

.binder/requirements.txt

@@ -0,0 +1,9 @@
+ipywidgets
+jupyterlab >=3.2.4
+jupyterlab-link-share
+matplotlib
+networkx
+pidigits
+requests
+retrolab >=0.3.13
+wordfreq

ci/ssh/Dockerfile

@@ -7,6 +7,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
 
 ENV MAMBA_ROOT_PREFIX=/opt/conda
 ENV PATH=$MAMBA_ROOT_PREFIX/bin:$PATH
+ENV IPP_DISABLE_JS=1
 RUN wget -qO- https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba \
  && mv bin/micromamba /usr/local/bin/micromamba
 

docs/environment.yml

@@ -11,6 +11,6 @@ dependencies:
   - nbsphinx
   - myst-parser
 
-  - matplotlib
+  - matplotlib-base
   # nodejs needed for extension build
   - nodejs

lab/src/index.ts

@@ -1,25 +1,22 @@
 // IPython Parallel Lab extension derived from dask-labextension@f6141455d770ed7de564fc4aa403b9964cd4e617
 // License: BSD-3-Clause
 
+import { PageConfig } from "@jupyterlab/coreutils";
+
+import { TabPanel } from "@lumino/widgets";
+
 import {
   ILabShell,
-  ILayoutRestorer,
   JupyterFrontEnd,
   JupyterFrontEndPlugin,
 } from "@jupyterlab/application";
 
-import {
-  ICommandPalette,
-  ISessionContext,
-  IWidgetTracker,
-} from "@jupyterlab/apputils";
+import { ISessionContext, IWidgetTracker } from "@jupyterlab/apputils";
 
 import { CodeEditor } from "@jupyterlab/codeeditor";
 
 import { ConsolePanel, IConsoleTracker } from "@jupyterlab/console";
 
-import { IMainMenu } from "@jupyterlab/mainmenu";
-
 import { ISettingRegistry } from "@jupyterlab/settingregistry";
 
 import { IStateDB } from "@jupyterlab/statedb";
@@ -41,28 +38,22 @@ import { IClusterModel, ClusterManager } from "./clusters";
 import { Sidebar } from "./sidebar";
 
 import "../style/index.css";
+
 import logoSvgStr from "../style/logo.svg";
 
 import { CommandIDs } from "./commands";
 
 const PLUGIN_ID = "ipyparallel-labextension:plugin";
+const CATEGORY = "IPython Parallel";
 
 /**
  * The IPython Parallel extension.
  */
 const plugin: JupyterFrontEndPlugin<void> = {
   activate,
   id: PLUGIN_ID,
-  requires: [
-    ICommandPalette,
-    IConsoleTracker,
-    ILabShell,
-    ILayoutRestorer,
-    IMainMenu,
-    INotebookTracker,
-    ISettingRegistry,
-    IStateDB,
-  ],
+  requires: [IConsoleTracker, INotebookTracker, ISettingRegistry, IStateDB],
+  optional: [ILabShell],
   autoStart: true,
 };
 
@@ -76,17 +67,17 @@ export default plugin;
  */
 async function activate(
   app: JupyterFrontEnd,
-  commandPalette: ICommandPalette,
   consoleTracker: IConsoleTracker,
-  labShell: ILabShell,
-  restorer: ILayoutRestorer,
-  mainMenu: IMainMenu,
   notebookTracker: INotebookTracker,
   settingRegistry: ISettingRegistry,
-  state: IStateDB
+  state: IStateDB,
+  labShell?: ILabShell | null
 ): Promise<void> {
   const id = "ipp-cluster-launcher";
 
+  const isLab = !!labShell;
+  const isRetroTree = PageConfig.getOption("retroPage") == "tree";
+
   const clientCodeInjector = (model: IClusterModel) => {
     const editor = Private.getCurrentEditor(
       app,
@@ -112,9 +103,16 @@ async function activate(
   });
 
   // sidebar.title.iconClass = 'ipp-Logo jp-SideBar-tabIcon';
-  sidebar.title.caption = "IPython Parallel";
 
-  labShell.add(sidebar, "left", { rank: 200 });
+  if (isLab) {
+    labShell.add(sidebar, "left", { rank: 200 });
+    sidebar.title.caption = CATEGORY;
+  } else if (isRetroTree) {
+    const tabPanel = app.shell.currentWidget as TabPanel;
+    tabPanel.addWidget(sidebar);
+    tabPanel.tabBar.addTab(sidebar.title);
+    sidebar.title.label = CATEGORY;
+  }
 
   sidebar.clusterManager.activeClusterChanged.connect(async () => {
     const active = sidebar.clusterManager.activeCluster;

lab/style/index.css

@@ -17,10 +17,6 @@
  * Rules related to the cluster manager.
  */
 
-.ipp-ClusterManager {
-  border-top: 6px solid var(--jp-toolbar-border-color);
-}
-
 .ipp-ClusterManager .jp-Toolbar {
   align-items: center;
 }

setup.py

@@ -63,7 +63,7 @@ def run(self):
 
 data_files = get_data_files(data_files_spec)
 
-builder = npm_builder(build_cmd="build:prod")
+builder = npm_builder(build_cmd="build:prod", npm="jlpm")
 if os.environ.get("IPP_DISABLE_JS") == "1":
     print("Skipping js installation")
     cmdclass = {}
@@ -123,6 +123,8 @@ def run(self):
         "nbext": ["notebook", "jupyter_server"],
         "serverextension": ["jupyter_server"],
         "labextension": ["jupyter_server", "jupyterlab>=3"],
+        "retroextension": ["jupyter_server", "retrolab"],
+        "benchmark": ["asv"],
         "test": [
             "pytest",
             "pytest-cov",