-
-
Notifications
You must be signed in to change notification settings - Fork 350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade to JupyterLab 3 #191
Merged
Merged
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
2124710
upgrade to recent jupyterlab, lumino and electron
mbektas 5a4c3dc
vs code debugging support
mbektas 1229161
fix title bar height, make title bar draggable
mbektas b66be6a
remove external css
mbektas 627812a
use es6
mbektas 6eef2a8
fix for failing translations API calls
mbektas 3b1782b
bring back handleInputChange
mbektas b592907
fix mathjax config
mbektas c4799bb
fix css issues
mbektas 0f3454b
fix css order issue, upgrade to jlab 3.1.10
mbektas be143fc
Merge pull request #1 from mbektas/mb/fixes_for_css_issues
mbektas 9216776
Mac install configuration, use bundled environment
mbektas e746966
add ipywidgets, update instructions
mbektas 598094a
fix linux and windows builds
mbektas cbbb243
fixes for windows
mbektas 6d06e3e
fix windows install path, refactor
mbektas 7b7e29c
linux installation
mbektas 96a5c5a
show titlebar on Mac, remove server menu, refactor
mbektas 8a7a123
disable custom title bar, refactoring
mbektas 0c674ad
change file mod
mbektas 3c0e0c4
update documentation, clean-up
mbektas 8f5ffe2
Merge branch 'master' into jlab3_upgrade
mbektas a7d8295
fix broken yarn.lock during conflict resolve
mbektas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"version": "0.1.0", | ||
"configurations": [ | ||
{ | ||
"name": "Debug Electron App", | ||
"type": "node", | ||
"request": "launch", | ||
"cwd": "${workspaceFolder}", | ||
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", | ||
"windows": { | ||
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" | ||
}, | ||
"args" : ["."], | ||
"outputCapture": "std", | ||
"preLaunchTask": "npm: build" | ||
}, | ||
{ | ||
"name": "Debug Electron App without Build", | ||
"type": "node", | ||
"request": "launch", | ||
"cwd": "${workspaceFolder}", | ||
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", | ||
"windows": { | ||
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" | ||
}, | ||
"args" : ["."], | ||
"outputCapture": "std" | ||
} | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,66 @@ | ||
# Jupyterlab App | ||
# JupyterLab App | ||
|
||
[![Build Status](https://travis-ci.org/jupyterlab/jupyterlab_app.svg?branch=master)](https://travis-ci.org/jupyterlab/jupyterlab_app) | ||
A desktop application for [JupyterLab](https://github.com/jupyterlab/jupyterlab), based on [Electron](https://www.electronjs.org/). | ||
|
||
## Build dependencies | ||
|
||
A desktop application for [JupyterLab](https://github.com/jupyterlab/jupyterlab), based on [Electron](https://electron.atom.io/). | ||
|
||
### Build dependencies | ||
- [conda](https://docs.conda.io/en/latest/miniconda.html) | ||
|
||
You can install miniconda from https://docs.conda.io/en/latest/miniconda.html | ||
|
||
#### Linux | ||
- [(conda) Constructor](https://github.com/conda/constructor) to bundle JupyterLab App Server into the stand-alone application. You can install Constructor using: | ||
|
||
You will need the development packages of libcairo, libjpeg, and libgif. In Debian-based distributions, these are provided by the `libcairo2-dev`, `libjpeg8-dev`, and `libgif-dev` packages. | ||
`conda install constructor` | ||
|
||
### Getting started | ||
- nodejs | ||
|
||
1. run `git clone git@github.com:jupyterlab/jupyterlab_app.git` | ||
2. run `yarn install` or `npm install` | ||
3. run `yarn build:all` or `npm run build:all` | ||
You can install from https://nodejs.org/en/download/ or run `conda install nodejs` | ||
|
||
### Building for distribution | ||
- yarn | ||
|
||
To test building for distribution you can install [Docker](https://docs.docker.com/engine/installation/) and run `yarn dockerdist:platform` where "platform" is either "linux" or "win". To build for macOS a macOS computer is required. | ||
Install using `npm install --global yarn` | ||
|
||
If you don't want to user Docker but instead want to build locally, there are a few [dependencies](https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build) you're required to install. | ||
## Local development | ||
|
||
Regarding releasing please check out [release](Release.md) | ||
JupyterLab App bundles JupyterLab front-end and a conda environment as JupyterLab App Server as its backend into an Electron application. | ||
|
||
`<platform>`: mac, linux or win | ||
|
||
- Get the project source code | ||
|
||
`git clone https://github.com/jupyterlab/jupyterlab_app.git` | ||
|
||
- Install dependencies and build JupyterLab App | ||
|
||
`yarn` | ||
|
||
`yarn build` | ||
|
||
- Create the JupyterLab App Server installer using | ||
|
||
`yarn create_env_installer:<platform>` | ||
|
||
Installer will be created in one of `env_installer/JupyterLabAppServer<version>-MacOSX-x86_64.sh`, `env_installer/JupyterLabAppServer-<version>-Linux-x86_64.sh`, `env_installer/JupyterLabAppServer-<version>-Windows-x86_64.exe` based on your platform | ||
|
||
- Run the installer to install the JupyterLab App Server. Make sure to set install location to `jlab_server` directory that is at the same level as `jupyterlab_app` project source code | ||
|
||
- Now you can launch the JupyterLab App locally using: | ||
|
||
`yarn start` | ||
|
||
## Building for distribution | ||
|
||
- Build the application | ||
|
||
`yarn run clean && yarn build` | ||
|
||
- Create JupyterLab App Server installer | ||
|
||
`yarn create_env_installer:<platform>` | ||
|
||
- Create JupyterLab App installer which will also bundle JupyterLab App Server installer. | ||
|
||
`yarn dist:<platform>` | ||
|
||
App Installer will be created in `dist/JupyterLab.pkg` (macOS), `dist/JupyterLab.deb` (Debian, Ubuntu), `dist/JupyterLab.rpm` (Red Hat, Fedora) and `dist/JupyterLab-Setup.exe` (Windows) based on the platform |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
./opt/JupyterLab/resources/env_installer/JupyterLabAppServer-3.1.10-Linux-x86_64.sh -b -p "/opt/JupyterLab/resources/jlab_server" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
rm -rf "/opt/JupyterLab/resources/jlab_server" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#!/bin/bash | ||
|
||
"$2/JupyterLab.app/Contents/Resources/env_installer/JupyterLabAppServer-3.1.10-MacOSX-x86_64.sh" -b -p "$2/JupyterLab.app/Contents/Resources/jlab_server" | ||
|
||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
!macro preInit | ||
SetRegView 64 | ||
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\JupyterLab" | ||
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\JupyterLab" | ||
!macroend | ||
|
||
!macro customInstall | ||
ExecWait "$INSTDIR\resources\env_installer\JupyterLabAppServer-3.1.10-Windows-x86_64.exe" | ||
!macroend |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
name: JupyterLabAppServer | ||
version: 3.1.10 | ||
company: "Project Jupyter" | ||
|
||
channels: | ||
- https://conda.anaconda.org/conda-forge | ||
- http://repo.anaconda.com/pkgs/main/ | ||
|
||
specs: | ||
- python 3.8* | ||
- conda | ||
- numpy | ||
- scipy | ||
- pandas | ||
- jupyterlab 3.1.10 | ||
- ipywidgets 7.6.4 | ||
- matplotlib | ||
|
||
default_prefix: "%HOMEDRIVE%\\JupyterLab\\resources\\jlab_server" | ||
default_prefix_all_users: "%HOMEDRIVE%\\JupyterLab\\resources\\jlab_server" | ||
|
||
license_file: ../LICENSE |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is this file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@krassowski I copied the LICENSE file as is from jupyterlab repo. I just checked, semver.py is shipped with bundled jupyterlab python package. but I am not sure if it is OK to remove from jupyterlab-desktop license.