Skip to content

Commit

Permalink
Merge pull request spyder-ide#462 from jitseniesen/notebook72
Browse files Browse the repository at this point in the history 
Update to Jupyter Notebook version 7.2
  • Loading branch information
@jitseniesen
jitseniesen authored Aug 18, 2024
2 parents 2268a81 + 512b52b commit 51e52b7
Show file tree
Hide file tree
Showing 12 changed files with 4,302 additions and 3,416 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/run-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ jobs:
shell: bash
command: |
. ~/.profile
xvfb-run --auto-servernum pytest spyder-notebook/spyder_notebook -vv
cd spyder-notebook
xvfb-run --auto-servernum pytest spyder_notebook -vv
- name: Run tests (MacOS)
if: matrix.OS == 'macos'
uses: nick-fields/retry@v3
Expand All @@ -109,11 +110,14 @@ jobs:
shell: bash
command: |
. ~/.profile
pytest spyder-notebook/spyder_notebook -vv
cd spyder-notebook
pytest spyder_notebook -vv
- name: Run tests (Windows)
if: matrix.OS == 'windows'
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
command: pytest spyder-notebook/spyder_notebook -vv
command: |
cd spyder-notebook
pytest spyder_notebook -vv
2 changes: 1 addition & 1 deletion requirements/conda.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ spyder >=6.0.0.dev0,<7
jupyter_core
jupyter_server
nbformat
notebook >=7,<8
notebook >=7.2,<8
qtpy
qdarkstyle
requests
Expand Down
1 change: 0 additions & 1 deletion requirements/tests.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
flaky
pytest
pytest-cov
pytest-mock
pytest-qt
2 changes: 1 addition & 1 deletion setup.py
View file
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,<8',
'notebook>=7.2,<8',
'qtpy',
'qdarkstyle',
'requests',
Expand Down
255 changes: 128 additions & 127 deletions spyder_notebook/server/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,142 +6,140 @@
"build": "webpack"
},
"resolutions": {
"@jupyter-notebook/application": "~7.0.0",
"@jupyter-notebook/application-extension": "~7.0.0",
"@jupyter-notebook/docmanager-extension": "~7.0.0",
"@jupyter-notebook/documentsearch-extension": "~7.0.0",
"@jupyter-notebook/help-extension": "~7.0.0",
"@jupyter-notebook/notebook-extension": "~7.0.0",
"@jupyter-notebook/ui-components": "~7.0.0",
"@jupyter-notebook/application": "~7.2.1",
"@jupyter-notebook/application-extension": "~7.2.1",
"@jupyter-notebook/docmanager-extension": "~7.2.1",
"@jupyter-notebook/documentsearch-extension": "~7.2.1",
"@jupyter-notebook/help-extension": "~7.2.1",
"@jupyter-notebook/notebook-extension": "~7.2.1",
"@jupyter-notebook/ui-components": "~7.2.1",
"@jupyter/ydoc": "~1.0.2",
"@jupyterlab/application": "~4.0.3",
"@jupyterlab/application-extension": "~4.0.3",
"@jupyterlab/apputils": "~4.1.3",
"@jupyterlab/apputils-extension": "~4.0.3",
"@jupyterlab/cell-toolbar": "~4.0.3",
"@jupyterlab/cell-toolbar-extension": "~4.0.3",
"@jupyterlab/celltags-extension": "~4.0.3",
"@jupyterlab/codeeditor": "~4.0.3",
"@jupyterlab/codemirror": "~4.0.3",
"@jupyterlab/codemirror-extension": "~4.0.3",
"@jupyterlab/completer": "~4.0.3",
"@jupyterlab/completer-extension": "~4.0.3",
"@jupyterlab/coreutils": "~6.0.3",
"@jupyterlab/debugger": "~4.0.3",
"@jupyterlab/debugger-extension": "~4.0.3",
"@jupyterlab/docmanager": "~4.0.3",
"@jupyterlab/docmanager-extension": "~4.0.3",
"@jupyterlab/documentsearch": "~4.0.3",
"@jupyterlab/documentsearch-extension": "~4.0.3",
"@jupyterlab/extensionmanager": "~4.0.3",
"@jupyterlab/extensionmanager-extension": "~4.0.3",
"@jupyterlab/filebrowser": "~4.0.3",
"@jupyterlab/filebrowser-extension": "~4.0.3",
"@jupyterlab/fileeditor": "~4.0.3",
"@jupyterlab/fileeditor-extension": "~4.0.3",
"@jupyterlab/htmlviewer": "~4.0.3",
"@jupyterlab/htmlviewer-extension": "~4.0.3",
"@jupyterlab/hub-extension": "~4.0.3",
"@jupyterlab/imageviewer": "~4.0.3",
"@jupyterlab/imageviewer-extension": "~4.0.3",
"@jupyterlab/javascript-extension": "~4.0.3",
"@jupyterlab/json-extension": "~4.0.3",
"@jupyterlab/lsp": "~4.0.3",
"@jupyterlab/lsp-extension": "~4.0.3",
"@jupyterlab/mainmenu": "~4.0.3",
"@jupyterlab/mainmenu-extension": "~4.0.3",
"@jupyterlab/markedparser-extension": "~4.0.3",
"@jupyterlab/mathjax-extension": "~4.0.3",
"@jupyterlab/metadataform-extension": "~4.0.3",
"@jupyterlab/notebook": "~4.0.3",
"@jupyterlab/notebook-extension": "~4.0.3",
"@jupyterlab/observables": "~5.0.3",
"@jupyterlab/outputarea": "~4.0.3",
"@jupyterlab/pdf-extension": "~4.0.3",
"@jupyterlab/rendermime": "~4.0.3",
"@jupyterlab/rendermime-extension": "~4.0.3",
"@jupyterlab/rendermime-interfaces": "~3.8.3",
"@jupyterlab/services": "~7.0.3",
"@jupyterlab/settingregistry": "~4.0.3",
"@jupyterlab/shortcuts-extension": "~4.0.3",
"@jupyterlab/statedb": "~4.0.3",
"@jupyterlab/statusbar": "~4.0.3",
"@jupyterlab/theme-dark-extension": "~4.0.3",
"@jupyterlab/theme-light-extension": "~4.0.3",
"@jupyterlab/toc-extension": "~6.0.3",
"@jupyterlab/tooltip": "~4.0.3",
"@jupyterlab/tooltip-extension": "~4.0.3",
"@jupyterlab/translation": "~4.0.3",
"@jupyterlab/translation-extension": "~4.0.3",
"@jupyterlab/ui-components": "~4.0.3",
"@jupyterlab/ui-components-extension": "~4.0.3",
"@jupyterlab/vega5-extension": "~4.0.3",
"@lumino/algorithm": "~2.0.0",
"@lumino/application": "~2.1.1",
"@lumino/commands": "~2.1.2",
"@lumino/coreutils": "~2.1.1",
"@lumino/disposable": "~2.1.1",
"@lumino/domutils": "~2.0.0",
"@lumino/dragdrop": "~2.1.1",
"@lumino/messaging": "~2.0.0",
"@lumino/properties": "~2.0.0",
"@lumino/signaling": "~2.1.1",
"@lumino/virtualdom": "~2.0.0",
"@lumino/widgets": "~2.1.1",
"@jupyterlab/apputils": "~4.3.0",
"@jupyterlab/apputils-extension": "~4.2.0",
"@jupyterlab/cell-toolbar": "~4.2.0",
"@jupyterlab/cell-toolbar-extension": "~4.2.0",
"@jupyterlab/celltags-extension": "~4.2.0",
"@jupyterlab/codeeditor": "~4.2.0",
"@jupyterlab/codemirror": "~4.2.0",
"@jupyterlab/codemirror-extension": "~4.2.0",
"@jupyterlab/completer": "~4.2.0",
"@jupyterlab/completer-extension": "~4.2.0",
"@jupyterlab/coreutils": "~6.2.0",
"@jupyterlab/debugger": "~4.2.0",
"@jupyterlab/debugger-extension": "~4.2.0",
"@jupyterlab/docmanager": "~4.2.0",
"@jupyterlab/docmanager-extension": "~4.2.0",
"@jupyterlab/documentsearch": "~4.2.0",
"@jupyterlab/documentsearch-extension": "~4.2.0",
"@jupyterlab/extensionmanager": "~4.2.0",
"@jupyterlab/extensionmanager-extension": "~4.2.0",
"@jupyterlab/filebrowser": "~4.2.0",
"@jupyterlab/filebrowser-extension": "~4.2.0",
"@jupyterlab/fileeditor": "~4.2.0",
"@jupyterlab/fileeditor-extension": "~4.2.0",
"@jupyterlab/htmlviewer": "~4.2.0",
"@jupyterlab/htmlviewer-extension": "~4.2.0",
"@jupyterlab/hub-extension": "~4.2.0",
"@jupyterlab/imageviewer": "~4.2.0",
"@jupyterlab/imageviewer-extension": "~4.2.0",
"@jupyterlab/javascript-extension": "~4.2.0",
"@jupyterlab/json-extension": "~4.2.0",
"@jupyterlab/lsp": "~4.2.0",
"@jupyterlab/lsp-extension": "~4.2.0",
"@jupyterlab/mainmenu": "~4.2.0",
"@jupyterlab/mainmenu-extension": "~4.2.0",
"@jupyterlab/markedparser-extension": "~4.2.0",
"@jupyterlab/mathjax-extension": "~4.2.0",
"@jupyterlab/metadataform-extension": "~4.2.0",
"@jupyterlab/notebook": "~4.2.0",
"@jupyterlab/notebook-extension": "~4.2.0",
"@jupyterlab/observables": "~5.2.0",
"@jupyterlab/outputarea": "~4.2.0",
"@jupyterlab/pdf-extension": "~4.2.0",
"@jupyterlab/rendermime": "~4.2.0",
"@jupyterlab/rendermime-interfaces": "~3.10.0",
"@jupyterlab/services": "~7.2.0",
"@jupyterlab/settingregistry": "~4.2.0",
"@jupyterlab/shortcuts-extension": "~5.0.0",
"@jupyterlab/statedb": "~4.2.0",
"@jupyterlab/statusbar": "~4.2.0",
"@jupyterlab/theme-dark-extension": "~4.2.0",
"@jupyterlab/theme-light-extension": "~4.2.0",
"@jupyterlab/toc-extension": "~6.2.0",
"@jupyterlab/tooltip": "~4.2.0",
"@jupyterlab/tooltip-extension": "~4.2.0",
"@jupyterlab/translation": "~4.2.0",
"@jupyterlab/translation-extension": "~4.2.0",
"@jupyterlab/ui-components": "~4.2.0",
"@jupyterlab/ui-components-extension": "~4.2.0",
"@jupyterlab/vega5-extension": "~4.2.0",
"@lumino/algorithm": "~2.0.1",
"@lumino/application": "~2.3.1",
"@lumino/commands": "~2.3.0",
"@lumino/coreutils": "~2.1.2",
"@lumino/disposable": "~2.1.2",
"@lumino/domutils": "~2.0.1",
"@lumino/dragdrop": "~2.1.4",
"@lumino/messaging": "~2.0.1",
"@lumino/properties": "~2.0.1",
"@lumino/signaling": "~2.1.2",
"@lumino/virtualdom": "~2.0.1",
"@lumino/widgets": "~2.3.2",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"yjs": "~13.6.2"
"yjs": "~13.6.8"
},
"dependencies": {
"@jupyter-notebook/application": "^7.0.0",
"@jupyter-notebook/application-extension": "^7.0.0",
"@jupyter-notebook/docmanager-extension": "^7.0.0",
"@jupyter-notebook/documentsearch-extension": "^7.0.0",
"@jupyter-notebook/help-extension": "^7.0.0",
"@jupyter-notebook/notebook-extension": "^7.0.0",
"@jupyter-notebook/ui-components": "^7.0.0",
"@jupyterlab/application-extension": "^4.0.3",
"@jupyterlab/apputils-extension": "^4.0.3",
"@jupyterlab/cell-toolbar-extension": "^4.0.3",
"@jupyterlab/celltags-extension": "^4.0.3",
"@jupyterlab/codemirror": "^4.0.3",
"@jupyterlab/codemirror-extension": "^4.0.3",
"@jupyterlab/completer-extension": "^4.0.3",
"@jupyterlab/coreutils": "^6.0.3",
"@jupyterlab/debugger-extension": "^4.0.3",
"@jupyterlab/docmanager-extension": "^4.0.3",
"@jupyterlab/documentsearch-extension": "^4.0.3",
"@jupyterlab/extensionmanager-extension": "^4.0.3",
"@jupyterlab/filebrowser-extension": "^4.0.3",
"@jupyterlab/fileeditor-extension": "^4.0.3",
"@jupyterlab/htmlviewer-extension": "^4.0.3",
"@jupyterlab/hub-extension": "^4.0.3",
"@jupyterlab/imageviewer-extension": "^4.0.3",
"@jupyterlab/javascript-extension": "^4.0.3",
"@jupyterlab/json-extension": "^4.0.3",
"@jupyterlab/lsp": "^4.0.3",
"@jupyterlab/lsp-extension": "^4.0.3",
"@jupyterlab/mainmenu-extension": "^4.0.3",
"@jupyterlab/markedparser-extension": "^4.0.3",
"@jupyterlab/mathjax-extension": "^4.0.3",
"@jupyterlab/metadataform-extension": "^4.0.3",
"@jupyterlab/notebook-extension": "^4.0.3",
"@jupyterlab/pdf-extension": "^4.0.3",
"@jupyterlab/rendermime-extension": "^4.0.3",
"@jupyterlab/shortcuts-extension": "^4.0.3",
"@jupyterlab/theme-dark-extension": "^4.0.3",
"@jupyterlab/theme-light-extension": "^4.0.3",
"@jupyterlab/toc-extension": "^6.0.3",
"@jupyterlab/tooltip-extension": "^4.0.3",
"@jupyterlab/translation-extension": "^4.0.3",
"@jupyterlab/ui-components-extension": "^4.0.3",
"@jupyterlab/vega5-extension": "^4.0.3",
"@jupyter-notebook/application": "~7.2.1",
"@jupyter-notebook/application-extension": "~7.2.1",
"@jupyter-notebook/docmanager-extension": "~7.2.1",
"@jupyter-notebook/documentsearch-extension": "~7.2.1",
"@jupyter-notebook/help-extension": "~7.2.1",
"@jupyter-notebook/notebook-extension": "~7.2.1",
"@jupyter-notebook/ui-components": "~7.2.1",
"@jupyterlab/application-extension": "~4.2.0",
"@jupyterlab/apputils-extension": "~4.2.0",
"@jupyterlab/cell-toolbar-extension": "~4.2.0",
"@jupyterlab/celltags-extension": "~4.2.0",
"@jupyterlab/codemirror": "~4.2.0",
"@jupyterlab/codemirror-extension": "~4.2.0",
"@jupyterlab/completer-extension": "~4.2.0",
"@jupyterlab/coreutils": "~6.2.0",
"@jupyterlab/debugger-extension": "~4.2.0",
"@jupyterlab/docmanager-extension": "~4.2.0",
"@jupyterlab/documentsearch-extension": "~4.2.0",
"@jupyterlab/extensionmanager-extension": "~4.2.0",
"@jupyterlab/filebrowser-extension": "~4.2.0",
"@jupyterlab/fileeditor-extension": "~4.2.0",
"@jupyterlab/htmlviewer-extension": "~4.2.0",
"@jupyterlab/hub-extension": "~4.2.0",
"@jupyterlab/imageviewer-extension": "~4.2.0",
"@jupyterlab/javascript-extension": "~4.2.0",
"@jupyterlab/json-extension": "~4.2.0",
"@jupyterlab/lsp": "~4.2.0",
"@jupyterlab/lsp-extension": "~4.2.0",
"@jupyterlab/mainmenu-extension": "~4.2.0",
"@jupyterlab/markedparser-extension": "~4.2.0",
"@jupyterlab/mathjax-extension": "~4.2.0",
"@jupyterlab/metadataform-extension": "~4.2.0",
"@jupyterlab/notebook-extension": "~4.2.0",
"@jupyterlab/pdf-extension": "~4.2.0",
"@jupyterlab/shortcuts-extension": "~5.0.0",
"@jupyterlab/theme-dark-extension": "~4.2.0",
"@jupyterlab/theme-light-extension": "~4.2.0",
"@jupyterlab/toc-extension": "~6.2.0",
"@jupyterlab/tooltip-extension": "~4.2.0",
"@jupyterlab/translation-extension": "~4.2.0",
"@jupyterlab/ui-components-extension": "~4.2.0",
"@jupyterlab/vega5-extension": "~4.2.0",
"@spyder-notebook/application": "^0.5.0-dev.0",
"@spyder-notebook/application-extension": "^0.5.0-dev.0"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.3",
"@jupyterlab/buildutils": "^4.0.3",
"@jupyterlab/builder": "~4.2.0",
"@jupyterlab/buildutils": "~4.2.0",
"css-loader": "~5.0.1",
"fs-extra": "^8.1.0",
"glob": "~7.1.6",
Expand Down Expand Up @@ -173,6 +171,7 @@
"@jupyter-notebook/application-extension:menu-spacer",
"@jupyter-notebook/application-extension:pages",
"@jupyter-notebook/application-extension:paths",
"@jupyter-notebook/application-extension:rendermime",
"@jupyter-notebook/application-extension:shell",
"@jupyter-notebook/application-extension:splash",
"@jupyter-notebook/application-extension:status",
Expand Down Expand Up @@ -228,17 +227,19 @@
"@jupyterlab/htmlviewer-extension": true,
"@jupyterlab/imageviewer-extension": true,
"@jupyterlab/lsp-extension": true,
"@jupyterlab/mainmenu-extension": true,
"@jupyterlab/mainmenu-extension": [
"@jupyterlab/mainmenu-extension:plugin"
],
"@jupyterlab/markedparser-extension": true,
"@jupyterlab/mathjax-extension": true,
"@jupyterlab/notebook-extension": [
"@jupyterlab/notebook-extension:cell-executor",
"@jupyterlab/notebook-extension:code-console",
"@jupyterlab/notebook-extension:export",
"@jupyterlab/notebook-extension:factory",
"@jupyterlab/notebook-extension:tracker",
"@jupyterlab/notebook-extension:widget-factory"
],
"@jupyterlab/rendermime-extension": true,
"@jupyterlab/shortcuts-extension": true,
"@jupyterlab/theme-light-extension": true,
"@jupyterlab/theme-dark-extension": true,
Expand Down
5 changes: 4 additions & 1 deletion spyder_notebook/server/app/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,13 @@ module.exports = [
},
filename: 'bundle.js',
},
resolve: {
fallback: { util: false },
},
plugins: [
new WPPlugin.JSONLicenseWebpackPlugin({
excludedPackageTest: (packageName) =>
packageName === '@jupyter-notebook/app',
packageName === '@spyder-notebook/app', // Spyder: change name
}),
new ModuleFederationPlugin({
library: {
Expand Down
9 changes: 5 additions & 4 deletions spyder_notebook/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
]
},
"scripts": {
"build": "lerna run build"
"build": "lerna run build",
"deduplicate": "jlpm dlx yarn-berry-deduplicate -s fewerHighest && jlpm install"
},
"devDependencies": {
"@jupyterlab/buildutils": "^4.0.3",
"lerna": "^6.5.1",
"typescript": "5.0.2"
"@jupyterlab/buildutils": "~4.2.0",
"lerna": "^6.6.2",
"typescript": "~5.0.2"
}
}
8 changes: 4 additions & 4 deletions spyder_notebook/server/packages/application-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"build": "tsc -b"
},
"dependencies": {
"@jupyterlab/application": "^4.0.3",
"@jupyterlab/docmanager": "^4.0.3",
"@jupyterlab/mainmenu": "^4.0.3"
"@jupyterlab/application": "~4.2.0",
"@jupyterlab/docmanager": "~4.2.0",
"@jupyterlab/mainmenu": "~4.2.0"
},
"devDependencies": {
"typescript": "5.0.2"
"typescript": "~5.0.2"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 51e52b7

Please sign in to comment.