Skip to content

Commit

Permalink
Merge pull request #415 from jitseniesen/jup-notebook-beta
Browse files Browse the repository at this point in the history
PR: Update to Jupyter Notebook v7 beta
  • Loading branch information
jitseniesen authored Apr 25, 2023
2 parents a0e6ae0 + 8dcf769 commit 654ffd7
Show file tree
Hide file tree
Showing 14 changed files with 13,672 additions and 9,996 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,16 @@ jobs:
shell: bash -l {0}
run: |
python .github/scripts/generate-without-spyder.py
mamba install --file requirements/without-spyder.txt -y
mamba install -c conda-forge/label/notebook_beta -c conda-forge/label/jupyterlab_beta --file requirements/without-spyder.txt -y
- name: Install plugin dependencies
if: matrix.SPYDER_SOURCE == 'conda'
shell: bash -l {0}
run: mamba install --file requirements/conda.txt -y
run: mamba install -c conda-forge/label/notebook_beta -c conda-forge/label/jupyterlab_beta --file requirements/conda.txt -y
- name: Install test dependencies
shell: bash -l {0}
run: |
mamba install nomkl -y -q
mamba install --file requirements/tests.txt -y
- name: Install Jupyter Notebook using pip
shell: bash -l {0}
run: python -m pip install notebook==7.0.0a15 jupyterlab==4.0.0a34 --pre
- name: Build JavaScript
shell: bash -l {0}
run: |
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ spyder_notebook/server/schemas/
spyder_notebook/server/static/
tsconfig.tsbuildinfo

# yarn >=2.x local files
spyder_notebook/server/.yarn/*
spyder_notebook/server/.pnp.*

# git .orig files
*.orig
10 changes: 4 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,15 @@ $ conda install --file requirements/conda.txt
```

**For version 0.5.0-alpha of the plugin:** The plugin is based on
Jupyter Notebook 7, which is only available as an alpha release on
PyPI. So in addition, we need to install it with pip usig the
Jupyter Notebook 7, which at the moment is only available as a beta
release. While that is the case, you should explicitly allow the
installation of beta releases of Jupyter Lab and Notebook as in the
following command:

```bash
$ python -m pip install notebook --pre
$ conda install -c conda-forge/label/notebook_beta -c conda-forge/label/jupyterlab_beta --file requirements/conda.txt
```

Cross your fingers that the mixing of pip and conda does not
cause any problems!

### Building the notebook server

The Spyder notebook plugin includes a server which serves notebooks as HTML
Expand Down
2 changes: 1 addition & 1 deletion requirements/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ spyder >=5.4.3,<6
jupyter_core
jupyter_server
nbformat
# notebook >=7 - can only be installed with pip
notebook >=7.0.0b0
qtpy
qdarkstyle
requests
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def run(self):
REQUIREMENTS = [
'spyder>=5.4.3,<6',
'nbformat',
'notebook>=7',
'notebook>=7.0.0b0',
'qtpy',
'qdarkstyle',
'requests',
Expand Down
5 changes: 5 additions & 0 deletions spyder_notebook/server/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enableImmutableInstalls: false
enableInlineBuilds: false
enableTelemetry: false
httpTimeout: 60000
nodeLinker: node-modules
252 changes: 126 additions & 126 deletions spyder_notebook/server/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,139 +6,139 @@
"build": "webpack"
},
"resolutions": {
"@jupyter-notebook/application": "~7.0.0-alpha.15",
"@jupyter-notebook/application-extension": "~7.0.0-alpha.15",
"@jupyter-notebook/docmanager-extension": "~7.0.0-alpha.15",
"@jupyter-notebook/documentsearch-extension": "~7.0.0-alpha.15",
"@jupyter-notebook/help-extension": "~7.0.0-alpha.15",
"@jupyter-notebook/notebook-extension": "~7.0.0-alpha.15",
"@jupyter-notebook/ui-components": "~7.0.0-alpha.15",
"@jupyter-notebook/application": "~7.0.0-beta.0",
"@jupyter-notebook/application-extension": "~7.0.0-beta.0",
"@jupyter-notebook/docmanager-extension": "~7.0.0-beta.0",
"@jupyter-notebook/documentsearch-extension": "~7.0.0-beta.0",
"@jupyter-notebook/help-extension": "~7.0.0-beta.0",
"@jupyter-notebook/notebook-extension": "~7.0.0-beta.0",
"@jupyter-notebook/ui-components": "~7.0.0-beta.0",
"@jupyter/ydoc": "~0.3.4",
"@jupyterlab/application": "~4.0.0-alpha.20",
"@jupyterlab/application-extension": "~4.0.0-alpha.20",
"@jupyterlab/apputils": "~4.0.0-alpha.20",
"@jupyterlab/apputils-extension": "~4.0.0-alpha.20",
"@jupyterlab/cell-toolbar": "~4.0.0-alpha.20",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.20",
"@jupyterlab/application": "~4.0.0-beta.0",
"@jupyterlab/application-extension": "~4.0.0-beta.0",
"@jupyterlab/apputils": "~4.0.0-beta.0",
"@jupyterlab/apputils-extension": "~4.0.0-beta.0",
"@jupyterlab/cell-toolbar": "~4.0.0-beta.0",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-beta.0",
"@jupyterlab/celltags": "~4.0.0-alpha.20",
"@jupyterlab/celltags-extension": "~4.0.0-alpha.20",
"@jupyterlab/codeeditor": "~4.0.0-alpha.20",
"@jupyterlab/codemirror": "~4.0.0-alpha.20",
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.20",
"@jupyterlab/completer": "~4.0.0-alpha.20",
"@jupyterlab/completer-extension": "~4.0.0-alpha.20",
"@jupyterlab/coreutils": "~6.0.0-alpha.20",
"@jupyterlab/debugger": "~4.0.0-alpha.20",
"@jupyterlab/debugger-extension": "~4.0.0-alpha.20",
"@jupyterlab/docmanager": "~4.0.0-alpha.20",
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.20",
"@jupyterlab/documentsearch": "~4.0.0-alpha.20",
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.20",
"@jupyterlab/extensionmanager": "~4.0.0-alpha.20",
"@jupyterlab/extensionmanager-extension": "~4.0.0-alpha.20",
"@jupyterlab/filebrowser": "~4.0.0-alpha.20",
"@jupyterlab/filebrowser-extension": "~4.0.0-alpha.20",
"@jupyterlab/fileeditor": "~4.0.0-alpha.20",
"@jupyterlab/fileeditor-extension": "~4.0.0-alpha.20",
"@jupyterlab/htmlviewer": "~4.0.0-alpha.20",
"@jupyterlab/htmlviewer-extension": "~4.0.0-alpha.20",
"@jupyterlab/hub-extension": "~4.0.0-alpha.20",
"@jupyterlab/javascript-extension": "~4.0.0-alpha.20",
"@jupyterlab/json-extension": "~4.0.0-alpha.20",
"@jupyterlab/lsp": "~4.0.0-alpha.20",
"@jupyterlab/lsp-extension": "~4.0.0-alpha.20",
"@jupyterlab/mainmenu": "~4.0.0-alpha.20",
"@jupyterlab/mainmenu-extension": "~4.0.0-alpha.20",
"@jupyterlab/markedparser-extension": "~4.0.0-alpha.20",
"@jupyterlab/mathjax2-extension": "~4.0.0-alpha.20",
"@jupyterlab/notebook": "~4.0.0-alpha.20",
"@jupyterlab/notebook-extension": "~4.0.0-alpha.20",
"@jupyterlab/observables": "~5.0.0-alpha.20",
"@jupyterlab/outputarea": "~4.0.0-alpha.20",
"@jupyterlab/pdf-extension": "~4.0.0-alpha.20",
"@jupyterlab/rendermime": "~4.0.0-alpha.20",
"@jupyterlab/rendermime-extension": "~4.0.0-alpha.20",
"@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.20",
"@jupyterlab/services": "~7.0.0-alpha.20",
"@jupyterlab/settingregistry": "~4.0.0-alpha.20",
"@jupyterlab/shortcuts-extension": "~4.0.0-alpha.20",
"@jupyterlab/statedb": "~4.0.0-alpha.20",
"@jupyterlab/statusbar": "~4.0.0-alpha.20",
"@jupyterlab/theme-dark-extension": "~4.0.0-alpha.20",
"@jupyterlab/theme-light-extension": "~4.0.0-alpha.20",
"@jupyterlab/toc-extension": "~6.0.0-alpha.20",
"@jupyterlab/tooltip": "~4.0.0-alpha.20",
"@jupyterlab/tooltip-extension": "~4.0.0-alpha.20",
"@jupyterlab/translation": "~4.0.0-alpha.20",
"@jupyterlab/translation-extension": "~4.0.0-alpha.20",
"@jupyterlab/ui-components": "~4.0.0-alpha.35",
"@jupyterlab/ui-components-extension": "~4.0.0-alpha.20",
"@jupyterlab/vega5-extension": "~4.0.0-alpha.20",
"@lumino/algorithm": "~2.0.0-rc.1",
"@lumino/application": "~2.0.0-rc.1",
"@lumino/commands": "~2.0.0-rc.1",
"@lumino/coreutils": "~2.0.0-rc.1",
"@lumino/disposable": "~2.0.0-rc.1",
"@lumino/domutils": "~2.0.0-rc.1",
"@lumino/dragdrop": "~2.0.0-rc.1",
"@lumino/messaging": "~2.0.0-rc.1",
"@lumino/properties": "~2.0.0-rc.1",
"@lumino/signaling": "~2.0.0-rc.1",
"@lumino/virtualdom": "~2.0.0-rc.1",
"@lumino/widgets": "~2.0.0-rc.1",
"@jupyterlab/celltags-extension": "~4.0.0-beta.0",
"@jupyterlab/codeeditor": "~4.0.0-beta.0",
"@jupyterlab/codemirror": "~4.0.0-beta.0",
"@jupyterlab/codemirror-extension": "~4.0.0-beta.0",
"@jupyterlab/completer": "~4.0.0-beta.0",
"@jupyterlab/completer-extension": "~4.0.0-beta.0",
"@jupyterlab/coreutils": "~6.0.0-beta.0",
"@jupyterlab/debugger": "~4.0.0-beta.0",
"@jupyterlab/debugger-extension": "~4.0.0-beta.0",
"@jupyterlab/docmanager": "~4.0.0-beta.0",
"@jupyterlab/docmanager-extension": "~4.0.0-beta.0",
"@jupyterlab/documentsearch": "~4.0.0-beta.0",
"@jupyterlab/documentsearch-extension": "~4.0.0-beta.0",
"@jupyterlab/extensionmanager": "~4.0.0-beta.0",
"@jupyterlab/extensionmanager-extension": "~4.0.0-beta.0",
"@jupyterlab/filebrowser": "~4.0.0-beta.0",
"@jupyterlab/filebrowser-extension": "~4.0.0-beta.0",
"@jupyterlab/fileeditor": "~4.0.0-beta.0",
"@jupyterlab/fileeditor-extension": "~4.0.0-beta.0",
"@jupyterlab/htmlviewer": "~4.0.0-beta.0",
"@jupyterlab/htmlviewer-extension": "~4.0.0-beta.0",
"@jupyterlab/hub-extension": "~4.0.0-beta.0",
"@jupyterlab/javascript-extension": "~4.0.0-beta.0",
"@jupyterlab/json-extension": "~4.0.0-beta.0",
"@jupyterlab/lsp": "~4.0.0-beta.0",
"@jupyterlab/lsp-extension": "~4.0.0-beta.0",
"@jupyterlab/mainmenu": "~4.0.0-beta.0",
"@jupyterlab/mainmenu-extension": "~4.0.0-beta.0",
"@jupyterlab/markedparser-extension": "~4.0.0-beta.0",
"@jupyterlab/mathjax-extension": "~4.0.0-beta.0",
"@jupyterlab/notebook": "~4.0.0-beta.0",
"@jupyterlab/notebook-extension": "~4.0.0-beta.0",
"@jupyterlab/observables": "~5.0.0-beta0",
"@jupyterlab/outputarea": "~4.0.0-beta.0",
"@jupyterlab/pdf-extension": "~4.0.0-beta.0",
"@jupyterlab/rendermime": "~4.0.0-beta.0",
"@jupyterlab/rendermime-extension": "~4.0.0-beta.0",
"@jupyterlab/rendermime-interfaces": "~3.8.0-beta.0",
"@jupyterlab/services": "~7.0.0-beta.0",
"@jupyterlab/settingregistry": "~4.0.0-beta.0",
"@jupyterlab/shortcuts-extension": "~4.0.0-beta.0",
"@jupyterlab/statedb": "~4.0.0-beta.0",
"@jupyterlab/statusbar": "~4.0.0-beta.0",
"@jupyterlab/theme-dark-extension": "~4.0.0-beta.0",
"@jupyterlab/theme-light-extension": "~4.0.0-beta.0",
"@jupyterlab/toc-extension": "~6.0.0-beta.0",
"@jupyterlab/tooltip": "~4.0.0-beta.0",
"@jupyterlab/tooltip-extension": "~4.0.0-beta.0",
"@jupyterlab/translation": "~4.0.0-beta.0",
"@jupyterlab/translation-extension": "~4.0.0-beta.0",
"@jupyterlab/ui-components": "~4.0.0-beta.0",
"@jupyterlab/ui-components-extension": "~4.0.0-beta.0",
"@jupyterlab/vega5-extension": "~4.0.0-beta.0",
"@lumino/algorithm": "~2.0.0",
"@lumino/application": "~2.0.1",
"@lumino/commands": "~2.0.1",
"@lumino/coreutils": "~2.0.0",
"@lumino/disposable": "~2.0.0",
"@lumino/domutils": "~2.0.0",
"@lumino/dragdrop": "~2.0.0",
"@lumino/messaging": "~2.0.0",
"@lumino/properties": "~2.0.0",
"@lumino/signaling": "~2.0.0",
"@lumino/virtualdom": "~2.0.0",
"@lumino/widgets": "~2.0.1",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"yjs": "~13.5.48"
},
"dependencies": {
"@jupyter-notebook/application": "^7.0.0-alpha.15",
"@jupyter-notebook/application-extension": "^7.0.0-alpha.15",
"@jupyter-notebook/docmanager-extension": "^7.0.0-alpha.15",
"@jupyter-notebook/documentsearch-extension": "^7.0.0-alpha.15",
"@jupyter-notebook/help-extension": "^7.0.0-alpha.15",
"@jupyter-notebook/notebook-extension": "^7.0.0-alpha.15",
"@jupyter-notebook/ui-components": "^7.0.0-alpha.15",
"@jupyterlab/application-extension": "^4.0.0-alpha.20",
"@jupyterlab/apputils-extension": "^4.0.0-alpha.20",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.20",
"@jupyter-notebook/application": "^7.0.0-beta.0",
"@jupyter-notebook/application-extension": "^7.0.0-beta.0",
"@jupyter-notebook/docmanager-extension": "^7.0.0-beta.0",
"@jupyter-notebook/documentsearch-extension": "^7.0.0-beta.0",
"@jupyter-notebook/help-extension": "^7.0.0-beta.0",
"@jupyter-notebook/notebook-extension": "^7.0.0-beta.0",
"@jupyter-notebook/ui-components": "^7.0.0-beta.0",
"@jupyterlab/application-extension": "^4.0.0-beta.0",
"@jupyterlab/apputils-extension": "^4.0.0-beta.0",
"@jupyterlab/cell-toolbar-extension": "^4.0.0-beta.0",
"@jupyterlab/celltags": "^4.0.0-alpha.20",
"@jupyterlab/celltags-extension": "^4.0.0-alpha.20",
"@jupyterlab/codemirror": "^4.0.0-alpha.20",
"@jupyterlab/codemirror-extension": "^4.0.0-alpha.20",
"@jupyterlab/completer-extension": "^4.0.0-alpha.20",
"@jupyterlab/coreutils": "^6.0.0-alpha.20",
"@jupyterlab/debugger-extension": "^4.0.0-alpha.20",
"@jupyterlab/docmanager-extension": "^4.0.0-alpha.20",
"@jupyterlab/documentsearch-extension": "^4.0.0-alpha.20",
"@jupyterlab/extensionmanager-extension": "^4.0.0-alpha.20",
"@jupyterlab/filebrowser-extension": "^4.0.0-alpha.20",
"@jupyterlab/fileeditor-extension": "^4.0.0-alpha.20",
"@jupyterlab/htmlviewer-extension": "^4.0.0-alpha.20",
"@jupyterlab/hub-extension": "^4.0.0-alpha.20",
"@jupyterlab/javascript-extension": "^4.0.0-alpha.20",
"@jupyterlab/json-extension": "^4.0.0-alpha.20",
"@jupyterlab/lsp": "^4.0.0-alpha.20",
"@jupyterlab/lsp-extension": "^4.0.0-alpha.20",
"@jupyterlab/mainmenu-extension": "^4.0.0-alpha.20",
"@jupyterlab/markedparser-extension": "^4.0.0-alpha.20",
"@jupyterlab/mathjax2-extension": "^4.0.0-alpha.20",
"@jupyterlab/notebook-extension": "^4.0.0-alpha.20",
"@jupyterlab/pdf-extension": "^4.0.0-alpha.20",
"@jupyterlab/rendermime-extension": "^4.0.0-alpha.20",
"@jupyterlab/shortcuts-extension": "^4.0.0-alpha.20",
"@jupyterlab/theme-dark-extension": "^4.0.0-alpha.20",
"@jupyterlab/theme-light-extension": "^4.0.0-alpha.20",
"@jupyterlab/toc-extension": "^6.0.0-alpha.20",
"@jupyterlab/tooltip-extension": "^4.0.0-alpha.20",
"@jupyterlab/translation-extension": "^4.0.0-alpha.20",
"@jupyterlab/ui-components-extension": "^4.0.0-alpha.20",
"@jupyterlab/vega5-extension": "^4.0.0-alpha.20",
"@jupyterlab/celltags-extension": "^4.0.0-beta.0",
"@jupyterlab/codemirror": "^4.0.0-beta.0",
"@jupyterlab/codemirror-extension": "^4.0.0-beta.0",
"@jupyterlab/completer-extension": "^4.0.0-beta.0",
"@jupyterlab/coreutils": "^6.0.0-beta.0",
"@jupyterlab/debugger-extension": "^4.0.0-beta.0",
"@jupyterlab/docmanager-extension": "^4.0.0-beta.0",
"@jupyterlab/documentsearch-extension": "^4.0.0-beta.0",
"@jupyterlab/extensionmanager-extension": "^4.0.0-beta.0",
"@jupyterlab/filebrowser-extension": "^4.0.0-beta.0",
"@jupyterlab/fileeditor-extension": "^4.0.0-beta.0",
"@jupyterlab/htmlviewer-extension": "^4.0.0-beta.0",
"@jupyterlab/hub-extension": "^4.0.0-beta.0",
"@jupyterlab/javascript-extension": "^4.0.0-beta.0",
"@jupyterlab/json-extension": "^4.0.0-beta.0",
"@jupyterlab/lsp": "^4.0.0-beta.0",
"@jupyterlab/lsp-extension": "^4.0.0-beta.0",
"@jupyterlab/mainmenu-extension": "^4.0.0-beta.0",
"@jupyterlab/markedparser-extension": "^4.0.0-beta.0",
"@jupyterlab/mathjax-extension": "^4.0.0-beta.0",
"@jupyterlab/notebook-extension": "^4.0.0-beta.0",
"@jupyterlab/pdf-extension": "^4.0.0-beta.0",
"@jupyterlab/rendermime-extension": "^4.0.0-beta.0",
"@jupyterlab/shortcuts-extension": "^4.0.0-beta.0",
"@jupyterlab/theme-dark-extension": "^4.0.0-beta.0",
"@jupyterlab/theme-light-extension": "^4.0.0-beta.0",
"@jupyterlab/toc-extension": "^6.0.0-beta.0",
"@jupyterlab/tooltip-extension": "^4.0.0-beta.0",
"@jupyterlab/translation-extension": "^4.0.0-beta.0",
"@jupyterlab/ui-components-extension": "^4.0.0-beta.0",
"@jupyterlab/vega5-extension": "^4.0.0-beta.0",
"@spyder-notebook/application": "^0.5.0-dev.0",
"@spyder-notebook/application-extension": "^0.5.0-dev.0"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-alpha.20",
"@jupyterlab/buildutils": "^4.0.0-alpha.20",
"@jupyterlab/builder": "^4.0.0-beta.0",
"@jupyterlab/buildutils": "^4.0.0-beta.0",
"css-loader": "~5.0.1",
"fs-extra": "^8.1.0",
"glob": "~7.1.6",
Expand All @@ -147,9 +147,9 @@
"style-loader": "~1.0.1",
"svg-url-loader": "~6.0.0",
"watch": "~1.0.2",
"webpack": "^5.72.0",
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^4.9.2",
"webpack": "^5.76.1",
"webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^5.0.1",
"webpack-merge": "^5.8.0",
"whatwg-fetch": "^3.0.0"
},
Expand All @@ -170,7 +170,6 @@
"@jupyter-notebook/application-extension:menu-spacer",
"@jupyter-notebook/application-extension:pages",
"@jupyter-notebook/application-extension:paths",
"@jupyter-notebook/application-extension:session-dialogs",
"@jupyter-notebook/application-extension:shell",
"@jupyter-notebook/application-extension:status",
"@jupyter-notebook/application-extension:tab-title",
Expand All @@ -192,6 +191,7 @@
"@jupyterlab/apputils-extension": [
"@jupyterlab/apputils-extension:palette",
"@jupyterlab/apputils-extension:sanitizer",
"@jupyterlab/apputils-extension:sessionDialogs",
"@jupyterlab/apputils-extension:settings",
"@jupyterlab/apputils-extension:state",
"@jupyterlab/apputils-extension:themes",
Expand Down Expand Up @@ -223,7 +223,7 @@
"@jupyterlab/lsp-extension": true,
"@jupyterlab/mainmenu-extension": true,
"@jupyterlab/markedparser-extension": true,
"@jupyterlab/mathjax2-extension": true,
"@jupyterlab/mathjax-extension": true,
"@jupyterlab/notebook-extension": [
"@jupyterlab/notebook-extension:code-console",
"@jupyterlab/notebook-extension:export",
Expand Down
Loading

0 comments on commit 654ffd7

Please sign in to comment.