From be8d3a0d9871ecc36c21532f4de5ac9dbf66ac0b Mon Sep 17 00:00:00 2001 From: Mehmet Bektas Date: Mon, 27 Sep 2021 20:52:23 -0700 Subject: [PATCH 1/4] use %pip instead of !pip --- env-customization-guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env-customization-guide.md b/env-customization-guide.md index 601f9a53..3d6fd657 100644 --- a/env-customization-guide.md +++ b/env-customization-guide.md @@ -34,10 +34,10 @@ Make sure you installed JupyterLab App following the steps outlined above in ord - Open a Notebook and run the command below in a cell for the package you want to install. You will see the log of the installation process as the cell output. ```bash - !pip install + %pip install ``` For example: to install scikit-learn ```bash - !pip install scikit-learn + %pip install scikit-learn ``` - In order to use the newly installed package you need to restart your active notebook's kernel or create a new notebook From ed8422067828654aaafd023c6bb65a6209d1db8d Mon Sep 17 00:00:00 2001 From: Mehmet Bektas Date: Mon, 27 Sep 2021 21:28:02 -0700 Subject: [PATCH 2/4] remove dev dependency usage --- src/main/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/server.ts b/src/main/server.ts index a88eb477..a13d0801 100644 --- a/src/main/server.ts +++ b/src/main/server.ts @@ -29,7 +29,7 @@ import { import log from 'electron-log'; import * as path from 'path'; -import * as fs from 'fs-extra'; +import * as fs from 'fs'; export class JupyterServer { From f47238549408aec8d44e52e2bf7b3a876af1831d Mon Sep 17 00:00:00 2001 From: Mehmet Bektas Date: Mon, 27 Sep 2021 21:31:23 -0700 Subject: [PATCH 3/4] use absolute versions to enable building for older jlab versions --- scripts/buildutil.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/buildutil.js b/scripts/buildutil.js index a2fb2ac4..022199f9 100644 --- a/scripts/buildutil.js +++ b/scripts/buildutil.js @@ -38,7 +38,7 @@ const cli = meow( } ); -const searchTextInFile = (filePath, text) => { +function searchTextInFile(filePath, text) { try { const fileContent = fs.readFileSync(filePath, "utf8"); return fileContent.includes(text); @@ -47,7 +47,16 @@ const searchTextInFile = (filePath, text) => { } return false; -}; +} + +// remove ~ or ^ prefix from semver version +function makeVersionAbsolute(version) { + if (version.length > 0 && (version[0] === '^' || version[0] === '~')) { + return version.substring(1); + } + + return version; +} /* * Checks if JupyterLab extensions listed in package.json @@ -238,7 +247,7 @@ if (cli.flags.setJupyterlabVersion !== "") { for (const packageName in oldDependencies) { if (packageName.startsWith('@jupyterlab') && packageName in newDependencies) { - oldDependencies[packageName] = newDependencies[packageName]; + oldDependencies[packageName] = makeVersionAbsolute(newDependencies[packageName]); } } From 2b3a53354548e82ae2aec206bc89cefeb75a9f6a Mon Sep 17 00:00:00 2001 From: Mehmet Bektas Date: Mon, 27 Sep 2021 21:33:09 -0700 Subject: [PATCH 4/4] upgrade to jupyterlab 3.1.13 --- .../linux_after_install.sh | 2 +- electron-builder-scripts/postinstall | 2 +- electron-builder-scripts/wininstall.nsh | 2 +- env_installer/construct.yaml | 4 +- package.json | 184 +- src/browser/index.html | 2 +- tbump.toml | 2 +- yarn.lock | 2487 +++++++++-------- 8 files changed, 1353 insertions(+), 1332 deletions(-) diff --git a/electron-builder-scripts/linux_after_install.sh b/electron-builder-scripts/linux_after_install.sh index eba715b9..8db4dc6b 100644 --- a/electron-builder-scripts/linux_after_install.sh +++ b/electron-builder-scripts/linux_after_install.sh @@ -1 +1 @@ -./opt/JupyterLab/resources/env_installer/JupyterLabAppServer-3.1.12-2-Linux-x86_64.sh -b -p "/opt/JupyterLab/resources/jlab_server" +./opt/JupyterLab/resources/env_installer/JupyterLabAppServer-3.1.13-1-Linux-x86_64.sh -b -p "/opt/JupyterLab/resources/jlab_server" diff --git a/electron-builder-scripts/postinstall b/electron-builder-scripts/postinstall index 10ccad9f..823b8129 100755 --- a/electron-builder-scripts/postinstall +++ b/electron-builder-scripts/postinstall @@ -1,5 +1,5 @@ #!/bin/bash -"$2/JupyterLab.app/Contents/Resources/env_installer/JupyterLabAppServer-3.1.12-2-MacOSX-x86_64.sh" -b -p "$2/JupyterLab.app/Contents/Resources/jlab_server" +"$2/JupyterLab.app/Contents/Resources/env_installer/JupyterLabAppServer-3.1.13-1-MacOSX-x86_64.sh" -b -p "$2/JupyterLab.app/Contents/Resources/jlab_server" exit 0 diff --git a/electron-builder-scripts/wininstall.nsh b/electron-builder-scripts/wininstall.nsh index c10e2b81..8991e08e 100644 --- a/electron-builder-scripts/wininstall.nsh +++ b/electron-builder-scripts/wininstall.nsh @@ -5,5 +5,5 @@ !macroend !macro customInstall - ExecWait "$INSTDIR\resources\env_installer\JupyterLabAppServer-3.1.12-2-Windows-x86_64.exe" + ExecWait "$INSTDIR\resources\env_installer\JupyterLabAppServer-3.1.13-1-Windows-x86_64.exe" !macroend diff --git a/env_installer/construct.yaml b/env_installer/construct.yaml index bfe4e914..85dd0b4e 100644 --- a/env_installer/construct.yaml +++ b/env_installer/construct.yaml @@ -1,5 +1,5 @@ name: JupyterLabAppServer -version: 3.1.12-2 +version: 3.1.13-1 company: "Project Jupyter" welcome_image_text: "JupyterLab" @@ -21,7 +21,7 @@ license_file: ../LICENSE specs: - conda - ipywidgets 7.6.5 - - jupyterlab 3.1.12 + - jupyterlab 3.1.13 - matplotlib-base - numpy - pandas diff --git a/package.json b/package.json index bd60f001..826c121d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jupyterlab_app", - "version": "3.1.12-2", + "version": "3.1.13-1", "description": "A native app for JupyterLab, based on electron.", "main": "./build/out/main/main.js", "scripts": { @@ -140,97 +140,97 @@ "webpack-cli": "^4.5.0" }, "dependencies": { - "@jupyterlab/application": "~3.1.11", - "@jupyterlab/application-extension": "~3.1.11", - "@jupyterlab/apputils": "~3.1.11", - "@jupyterlab/apputils-extension": "~3.1.12", - "@jupyterlab/attachments": "~3.1.11", - "@jupyterlab/cells": "~3.1.11", - "@jupyterlab/celltags": "~3.1.11", - "@jupyterlab/celltags-extension": "~3.1.11", - "@jupyterlab/codeeditor": "~3.1.11", - "@jupyterlab/codemirror": "~3.1.11", - "@jupyterlab/codemirror-extension": "~3.1.11", - "@jupyterlab/completer": "~3.1.11", - "@jupyterlab/completer-extension": "~3.1.11", - "@jupyterlab/console": "~3.1.11", - "@jupyterlab/console-extension": "~3.1.11", - "@jupyterlab/coreutils": "~5.1.11", - "@jupyterlab/csvviewer": "~3.1.11", - "@jupyterlab/csvviewer-extension": "~3.1.11", - "@jupyterlab/debugger": "~3.1.11", - "@jupyterlab/debugger-extension": "~3.1.11", - "@jupyterlab/docmanager": "~3.1.11", - "@jupyterlab/docmanager-extension": "~3.1.11", - "@jupyterlab/docprovider": "~3.1.11", - "@jupyterlab/docprovider-extension": "~3.1.11", - "@jupyterlab/docregistry": "~3.1.11", - "@jupyterlab/documentsearch": "~3.1.11", - "@jupyterlab/documentsearch-extension": "~3.1.11", - "@jupyterlab/extensionmanager": "~3.1.11", - "@jupyterlab/extensionmanager-extension": "~3.1.11", - "@jupyterlab/filebrowser": "~3.1.11", - "@jupyterlab/filebrowser-extension": "~3.1.11", - "@jupyterlab/fileeditor": "~3.1.11", - "@jupyterlab/fileeditor-extension": "~3.1.11", - "@jupyterlab/help-extension": "~3.1.11", - "@jupyterlab/htmlviewer": "~3.1.11", - "@jupyterlab/htmlviewer-extension": "~3.1.11", - "@jupyterlab/hub-extension": "~3.1.11", - "@jupyterlab/imageviewer": "~3.1.11", - "@jupyterlab/imageviewer-extension": "~3.1.11", - "@jupyterlab/inspector": "~3.1.11", - "@jupyterlab/inspector-extension": "~3.1.11", - "@jupyterlab/javascript-extension": "~3.1.12", - "@jupyterlab/json-extension": "~3.1.12", - "@jupyterlab/launcher": "~3.1.11", - "@jupyterlab/launcher-extension": "~3.1.11", - "@jupyterlab/logconsole": "~3.1.11", - "@jupyterlab/logconsole-extension": "~3.1.11", - "@jupyterlab/mainmenu": "~3.1.11", - "@jupyterlab/mainmenu-extension": "~3.1.11", - "@jupyterlab/markdownviewer": "~3.1.11", - "@jupyterlab/markdownviewer-extension": "~3.1.11", - "@jupyterlab/mathjax2": "~3.1.11", - "@jupyterlab/mathjax2-extension": "~3.1.11", - "@jupyterlab/metapackage": "~3.1.12", - "@jupyterlab/nbconvert-css": "~3.1.11", - "@jupyterlab/nbformat": "~3.1.11", - "@jupyterlab/notebook": "~3.1.11", - "@jupyterlab/notebook-extension": "~3.1.11", - "@jupyterlab/observables": "~4.1.11", - "@jupyterlab/outputarea": "~3.1.11", - "@jupyterlab/pdf-extension": "~3.1.11", - "@jupyterlab/property-inspector": "~3.1.11", - "@jupyterlab/rendermime": "~3.1.11", - "@jupyterlab/rendermime-extension": "~3.1.11", - "@jupyterlab/rendermime-interfaces": "~3.1.11", - "@jupyterlab/running": "~3.1.11", - "@jupyterlab/running-extension": "~3.1.11", - "@jupyterlab/services": "~6.1.11", - "@jupyterlab/settingeditor": "~3.1.11", - "@jupyterlab/settingeditor-extension": "~3.1.11", - "@jupyterlab/settingregistry": "~3.1.11", - "@jupyterlab/shared-models": "~3.1.11", - "@jupyterlab/shortcuts-extension": "~3.1.11", - "@jupyterlab/statedb": "~3.1.11", - "@jupyterlab/statusbar": "~3.1.11", - "@jupyterlab/statusbar-extension": "~3.1.11", - "@jupyterlab/terminal": "~3.1.11", - "@jupyterlab/terminal-extension": "~3.1.11", - "@jupyterlab/theme-dark-extension": "~3.1.11", - "@jupyterlab/theme-light-extension": "~3.1.11", - "@jupyterlab/toc": "~5.1.11", - "@jupyterlab/toc-extension": "~5.1.11", - "@jupyterlab/tooltip": "~3.1.11", - "@jupyterlab/tooltip-extension": "~3.1.11", - "@jupyterlab/translation": "~3.1.11", - "@jupyterlab/translation-extension": "~3.1.11", - "@jupyterlab/ui-components": "~3.1.11", - "@jupyterlab/ui-components-extension": "~3.1.11", - "@jupyterlab/vdom": "~3.1.12", - "@jupyterlab/vdom-extension": "~3.1.12", - "@jupyterlab/vega5-extension": "~3.1.12", + "@jupyterlab/application": "3.1.12", + "@jupyterlab/application-extension": "3.1.12", + "@jupyterlab/apputils": "3.1.12", + "@jupyterlab/apputils-extension": "3.1.13", + "@jupyterlab/attachments": "3.1.12", + "@jupyterlab/cells": "3.1.12", + "@jupyterlab/celltags": "3.1.12", + "@jupyterlab/celltags-extension": "3.1.12", + "@jupyterlab/codeeditor": "3.1.12", + "@jupyterlab/codemirror": "3.1.12", + "@jupyterlab/codemirror-extension": "3.1.12", + "@jupyterlab/completer": "3.1.12", + "@jupyterlab/completer-extension": "3.1.12", + "@jupyterlab/console": "3.1.12", + "@jupyterlab/console-extension": "3.1.12", + "@jupyterlab/coreutils": "5.1.12", + "@jupyterlab/csvviewer": "3.1.12", + "@jupyterlab/csvviewer-extension": "3.1.12", + "@jupyterlab/debugger": "3.1.12", + "@jupyterlab/debugger-extension": "3.1.12", + "@jupyterlab/docmanager": "3.1.12", + "@jupyterlab/docmanager-extension": "3.1.12", + "@jupyterlab/docprovider": "3.1.12", + "@jupyterlab/docprovider-extension": "3.1.12", + "@jupyterlab/docregistry": "3.1.12", + "@jupyterlab/documentsearch": "3.1.12", + "@jupyterlab/documentsearch-extension": "3.1.12", + "@jupyterlab/extensionmanager": "3.1.12", + "@jupyterlab/extensionmanager-extension": "3.1.12", + "@jupyterlab/filebrowser": "3.1.12", + "@jupyterlab/filebrowser-extension": "3.1.12", + "@jupyterlab/fileeditor": "3.1.12", + "@jupyterlab/fileeditor-extension": "3.1.12", + "@jupyterlab/help-extension": "3.1.12", + "@jupyterlab/htmlviewer": "3.1.12", + "@jupyterlab/htmlviewer-extension": "3.1.12", + "@jupyterlab/hub-extension": "3.1.12", + "@jupyterlab/imageviewer": "3.1.12", + "@jupyterlab/imageviewer-extension": "3.1.12", + "@jupyterlab/inspector": "3.1.12", + "@jupyterlab/inspector-extension": "3.1.12", + "@jupyterlab/javascript-extension": "3.1.13", + "@jupyterlab/json-extension": "3.1.13", + "@jupyterlab/launcher": "3.1.12", + "@jupyterlab/launcher-extension": "3.1.12", + "@jupyterlab/logconsole": "3.1.12", + "@jupyterlab/logconsole-extension": "3.1.12", + "@jupyterlab/mainmenu": "3.1.12", + "@jupyterlab/mainmenu-extension": "3.1.12", + "@jupyterlab/markdownviewer": "3.1.12", + "@jupyterlab/markdownviewer-extension": "3.1.12", + "@jupyterlab/mathjax2": "3.1.12", + "@jupyterlab/mathjax2-extension": "3.1.12", + "@jupyterlab/metapackage": "3.1.13", + "@jupyterlab/nbconvert-css": "3.1.12", + "@jupyterlab/nbformat": "3.1.12", + "@jupyterlab/notebook": "3.1.12", + "@jupyterlab/notebook-extension": "3.1.12", + "@jupyterlab/observables": "4.1.12", + "@jupyterlab/outputarea": "3.1.12", + "@jupyterlab/pdf-extension": "3.1.12", + "@jupyterlab/property-inspector": "3.1.12", + "@jupyterlab/rendermime": "3.1.12", + "@jupyterlab/rendermime-extension": "3.1.12", + "@jupyterlab/rendermime-interfaces": "3.1.12", + "@jupyterlab/running": "3.1.12", + "@jupyterlab/running-extension": "3.1.12", + "@jupyterlab/services": "6.1.12", + "@jupyterlab/settingeditor": "3.1.12", + "@jupyterlab/settingeditor-extension": "3.1.12", + "@jupyterlab/settingregistry": "3.1.12", + "@jupyterlab/shared-models": "3.1.12", + "@jupyterlab/shortcuts-extension": "3.1.12", + "@jupyterlab/statedb": "3.1.12", + "@jupyterlab/statusbar": "3.1.12", + "@jupyterlab/statusbar-extension": "3.1.12", + "@jupyterlab/terminal": "3.1.12", + "@jupyterlab/terminal-extension": "3.1.12", + "@jupyterlab/theme-dark-extension": "3.1.12", + "@jupyterlab/theme-light-extension": "3.1.12", + "@jupyterlab/toc": "5.1.12", + "@jupyterlab/toc-extension": "5.1.12", + "@jupyterlab/tooltip": "3.1.12", + "@jupyterlab/tooltip-extension": "3.1.12", + "@jupyterlab/translation": "3.1.12", + "@jupyterlab/translation-extension": "3.1.12", + "@jupyterlab/ui-components": "3.1.12", + "@jupyterlab/ui-components-extension": "3.1.12", + "@jupyterlab/vdom": "3.1.13", + "@jupyterlab/vdom-extension": "3.1.13", + "@jupyterlab/vega5-extension": "3.1.13", "@jupyter-widgets/jupyterlab-manager": "~3.0.1", "@fortawesome/fontawesome-free": "^5.15.2", "@types/node": "^14.14.31", diff --git a/src/browser/index.html b/src/browser/index.html index 2fdc9d9f..67ad3079 100644 --- a/src/browser/index.html +++ b/src/browser/index.html @@ -11,7 +11,7 @@ JupyterLab