Skip to content
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.

Sign up for GitHub

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

Update to JupyterLab v4.4.0a1 #16

Closed
wants to merge 7 commits into from
Closed

Update to JupyterLab v4.4.0a1 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5243dd5
allow running with PAT
jtpio Dec 21, 2024
50d0f7c
bump galata
jtpio Dec 21, 2024
6f58a95
install in workflow
jtpio Dec 21, 2024
68ced3e
set default
jtpio Dec 21, 2024
9bb2215
wip
jtpio Dec 21, 2024
ed642af
test
jtpio Dec 21, 2024
0078723
Update to JupyterLab v4.4.0a1
github-actions[bot] Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions .github/workflows/upgrade-jupyterlab-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ on:
default: main
required: false
type: string
target_repo:
description: 'Target repository'
required: false
default: jupyter/notebook
type: string

env:
version_tag: 'latest'
Expand Down Expand Up @@ -70,11 +75,14 @@ jobs:
if [[ ! -z "$(git status --porcelain package.json)" ]]; then
jlpm install
jlpm deduplicate

cd ui-tests
jlpm install
fi

- name: Create a PR
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN || secrets.GITHUB_TOKEN }}
run: |
set -eux

Expand All @@ -95,9 +103,18 @@ jobs:
git commit . -m "Update to JupyterLab v${LATEST}"

git push --set-upstream origin "${BRANCH_NAME}"
gh pr create \
--base ${{ inputs.branch || 'main' }} \
--title "Update to JupyterLab v${LATEST}" \

PR_ARGS=(
--base "${{ inputs.branch || 'main' }}"
--title "Update to JupyterLab v${LATEST}"
--body "New JupyterLab release [v${LATEST}](https://github.com/jupyterlab/jupyterlab/releases/tag/v${LATEST}) is available. Please review the lock file carefully."
)

# Add --repo flag only if target_repo is specified
if [[ -n "${{ inputs.target_repo }}" ]]; then
PR_ARGS+=(--repo "${{ inputs.target_repo }}")
fi

gh pr create "${PR_ARGS[@]}"
fi
fi
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ repos:
files: "^notebook"
stages: [manual]
args: ["--install-types", "--non-interactive"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.3.4,<4.4"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.4.0a1,<4.5"]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: 'v1.10.0'
Expand Down
254 changes: 127 additions & 127 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,84 +26,84 @@
"@jupyter/react-components": "~0.16.7",
"@jupyter/web-components": "~0.16.7",
"@jupyter/ydoc": "~3.0.0",
"@jupyterlab/application": "~4.3.4",
"@jupyterlab/application-extension": "~4.3.4",
"@jupyterlab/apputils": "~4.4.4",
"@jupyterlab/apputils-extension": "~4.3.4",
"@jupyterlab/attachments": "~4.3.4",
"@jupyterlab/cell-toolbar": "~4.3.4",
"@jupyterlab/cell-toolbar-extension": "~4.3.4",
"@jupyterlab/celltags-extension": "~4.3.4",
"@jupyterlab/codeeditor": "~4.3.4",
"@jupyterlab/codemirror": "~4.3.4",
"@jupyterlab/codemirror-extension": "~4.3.4",
"@jupyterlab/completer": "~4.3.4",
"@jupyterlab/completer-extension": "~4.3.4",
"@jupyterlab/console": "~4.3.4",
"@jupyterlab/console-extension": "~4.3.4",
"@jupyterlab/coreutils": "~6.3.4",
"@jupyterlab/csvviewer-extension": "~4.3.4",
"@jupyterlab/debugger": "~4.3.4",
"@jupyterlab/debugger-extension": "~4.3.4",
"@jupyterlab/docmanager": "~4.3.4",
"@jupyterlab/docmanager-extension": "~4.3.4",
"@jupyterlab/documentsearch": "~4.3.4",
"@jupyterlab/documentsearch-extension": "~4.3.4",
"@jupyterlab/extensionmanager": "~4.3.4",
"@jupyterlab/extensionmanager-extension": "~4.3.4",
"@jupyterlab/filebrowser": "~4.3.4",
"@jupyterlab/filebrowser-extension": "~4.3.4",
"@jupyterlab/fileeditor": "~4.3.4",
"@jupyterlab/fileeditor-extension": "~4.3.4",
"@jupyterlab/help-extension": "~4.3.4",
"@jupyterlab/htmlviewer": "~4.3.4",
"@jupyterlab/htmlviewer-extension": "~4.3.4",
"@jupyterlab/hub-extension": "~4.3.4",
"@jupyterlab/imageviewer": "~4.3.4",
"@jupyterlab/imageviewer-extension": "~4.3.4",
"@jupyterlab/javascript-extension": "~4.3.4",
"@jupyterlab/json-extension": "~4.3.4",
"@jupyterlab/lsp": "~4.3.4",
"@jupyterlab/lsp-extension": "~4.3.4",
"@jupyterlab/mainmenu": "~4.3.4",
"@jupyterlab/mainmenu-extension": "~4.3.4",
"@jupyterlab/markdownviewer": "~4.3.4",
"@jupyterlab/markdownviewer-extension": "~4.3.4",
"@jupyterlab/markedparser-extension": "~4.3.4",
"@jupyterlab/mathjax-extension": "~4.3.4",
"@jupyterlab/mermaid": "~4.3.4",
"@jupyterlab/mermaid-extension": "~4.3.4",
"@jupyterlab/metadataform": "~4.3.4",
"@jupyterlab/metadataform-extension": "~4.3.4",
"@jupyterlab/notebook": "~4.3.4",
"@jupyterlab/notebook-extension": "~4.3.4",
"@jupyterlab/observables": "~5.3.4",
"@jupyterlab/outputarea": "~4.3.4",
"@jupyterlab/pdf-extension": "~4.3.4",
"@jupyterlab/pluginmanager-extension": "~4.3.4",
"@jupyterlab/rendermime": "~4.3.4",
"@jupyterlab/rendermime-interfaces": "~3.11.4",
"@jupyterlab/running-extension": "~4.3.4",
"@jupyterlab/services": "~7.3.4",
"@jupyterlab/settingeditor": "~4.3.4",
"@jupyterlab/settingeditor-extension": "~4.3.4",
"@jupyterlab/settingregistry": "~4.3.4",
"@jupyterlab/shortcuts-extension": "~5.1.4",
"@jupyterlab/statedb": "~4.3.4",
"@jupyterlab/statusbar": "~4.3.4",
"@jupyterlab/terminal": "~4.3.4",
"@jupyterlab/terminal-extension": "~4.3.4",
"@jupyterlab/theme-dark-extension": "~4.3.4",
"@jupyterlab/theme-dark-high-contrast-extension": "~4.3.4",
"@jupyterlab/theme-light-extension": "~4.3.4",
"@jupyterlab/toc-extension": "~6.3.4",
"@jupyterlab/tooltip": "~4.3.4",
"@jupyterlab/tooltip-extension": "~4.3.4",
"@jupyterlab/translation": "~4.3.4",
"@jupyterlab/translation-extension": "~4.3.4",
"@jupyterlab/ui-components": "~4.3.4",
"@jupyterlab/ui-components-extension": "~4.3.4",
"@jupyterlab/vega5-extension": "~4.3.4",
"@jupyterlab/application": "~4.4.0-alpha.1",
"@jupyterlab/application-extension": "~4.4.0-alpha.1",
"@jupyterlab/apputils": "~4.5.0-alpha.1",
"@jupyterlab/apputils-extension": "~4.4.0-alpha.1",
"@jupyterlab/attachments": "~4.4.0-alpha.1",
"@jupyterlab/cell-toolbar": "~4.4.0-alpha.1",
"@jupyterlab/cell-toolbar-extension": "~4.4.0-alpha.1",
"@jupyterlab/celltags-extension": "~4.4.0-alpha.1",
"@jupyterlab/codeeditor": "~4.4.0-alpha.1",
"@jupyterlab/codemirror": "~4.4.0-alpha.1",
"@jupyterlab/codemirror-extension": "~4.4.0-alpha.1",
"@jupyterlab/completer": "~4.4.0-alpha.1",
"@jupyterlab/completer-extension": "~4.4.0-alpha.1",
"@jupyterlab/console": "~4.4.0-alpha.1",
"@jupyterlab/console-extension": "~4.4.0-alpha.1",
"@jupyterlab/coreutils": "~6.4.0-alpha.1",
"@jupyterlab/csvviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/debugger": "~4.4.0-alpha.1",
"@jupyterlab/debugger-extension": "~4.4.0-alpha.1",
"@jupyterlab/docmanager": "~4.4.0-alpha.1",
"@jupyterlab/docmanager-extension": "~4.4.0-alpha.1",
"@jupyterlab/documentsearch": "~4.4.0-alpha.1",
"@jupyterlab/documentsearch-extension": "~4.4.0-alpha.1",
"@jupyterlab/extensionmanager": "~4.4.0-alpha.1",
"@jupyterlab/extensionmanager-extension": "~4.4.0-alpha.1",
"@jupyterlab/filebrowser": "~4.4.0-alpha.1",
"@jupyterlab/filebrowser-extension": "~4.4.0-alpha.1",
"@jupyterlab/fileeditor": "~4.4.0-alpha.1",
"@jupyterlab/fileeditor-extension": "~4.4.0-alpha.1",
"@jupyterlab/help-extension": "~4.4.0-alpha.1",
"@jupyterlab/htmlviewer": "~4.4.0-alpha.1",
"@jupyterlab/htmlviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/hub-extension": "~4.4.0-alpha.1",
"@jupyterlab/imageviewer": "~4.4.0-alpha.1",
"@jupyterlab/imageviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/javascript-extension": "~4.4.0-alpha.1",
"@jupyterlab/json-extension": "~4.4.0-alpha.1",
"@jupyterlab/lsp": "~4.4.0-alpha.1",
"@jupyterlab/lsp-extension": "~4.4.0-alpha.1",
"@jupyterlab/mainmenu": "~4.4.0-alpha.1",
"@jupyterlab/mainmenu-extension": "~4.4.0-alpha.1",
"@jupyterlab/markdownviewer": "~4.4.0-alpha.1",
"@jupyterlab/markdownviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/markedparser-extension": "~4.4.0-alpha.1",
"@jupyterlab/mathjax-extension": "~4.4.0-alpha.1",
"@jupyterlab/mermaid": "~4.4.0-alpha.1",
"@jupyterlab/mermaid-extension": "~4.4.0-alpha.1",
"@jupyterlab/metadataform": "~4.4.0-alpha.1",
"@jupyterlab/metadataform-extension": "~4.4.0-alpha.1",
"@jupyterlab/notebook": "~4.4.0-alpha.1",
"@jupyterlab/notebook-extension": "~4.4.0-alpha.1",
"@jupyterlab/observables": "~5.4.0-alpha.1",
"@jupyterlab/outputarea": "~4.4.0-alpha.1",
"@jupyterlab/pdf-extension": "~4.4.0-alpha.1",
"@jupyterlab/pluginmanager-extension": "~4.4.0-alpha.1",
"@jupyterlab/rendermime": "~4.4.0-alpha.1",
"@jupyterlab/rendermime-interfaces": "~3.12.0-alpha.1",
"@jupyterlab/running-extension": "~4.4.0-alpha.1",
"@jupyterlab/services": "~7.4.0-alpha.1",
"@jupyterlab/settingeditor": "~4.4.0-alpha.1",
"@jupyterlab/settingeditor-extension": "~4.4.0-alpha.1",
"@jupyterlab/settingregistry": "~4.4.0-alpha.1",
"@jupyterlab/shortcuts-extension": "~5.2.0-alpha.1",
"@jupyterlab/statedb": "~4.4.0-alpha.1",
"@jupyterlab/statusbar": "~4.4.0-alpha.1",
"@jupyterlab/terminal": "~4.4.0-alpha.1",
"@jupyterlab/terminal-extension": "~4.4.0-alpha.1",
"@jupyterlab/theme-dark-extension": "~4.4.0-alpha.1",
"@jupyterlab/theme-dark-high-contrast-extension": "~4.4.0-alpha.1",
"@jupyterlab/theme-light-extension": "~4.4.0-alpha.1",
"@jupyterlab/toc-extension": "~6.4.0-alpha.1",
"@jupyterlab/tooltip": "~4.4.0-alpha.1",
"@jupyterlab/tooltip-extension": "~4.4.0-alpha.1",
"@jupyterlab/translation": "~4.4.0-alpha.1",
"@jupyterlab/translation-extension": "~4.4.0-alpha.1",
"@jupyterlab/ui-components": "~4.4.0-alpha.1",
"@jupyterlab/ui-components-extension": "~4.4.0-alpha.1",
"@jupyterlab/vega5-extension": "~4.4.0-alpha.1",
"@lezer/common": "~1.2.1",
"@lezer/highlight": "~1.2.0",
"@lumino/algorithm": "~2.0.2",
Expand Down Expand Up @@ -134,60 +134,60 @@
"@jupyter-notebook/tree": "^7.3.2",
"@jupyter-notebook/tree-extension": "^7.3.2",
"@jupyter-notebook/ui-components": "^7.3.2",
"@jupyterlab/application-extension": "~4.3.4",
"@jupyterlab/apputils-extension": "~4.3.4",
"@jupyterlab/attachments": "~4.3.4",
"@jupyterlab/cell-toolbar-extension": "~4.3.4",
"@jupyterlab/celltags-extension": "~4.3.4",
"@jupyterlab/codemirror": "~4.3.4",
"@jupyterlab/codemirror-extension": "~4.3.4",
"@jupyterlab/completer-extension": "~4.3.4",
"@jupyterlab/console-extension": "~4.3.4",
"@jupyterlab/coreutils": "~6.3.4",
"@jupyterlab/csvviewer-extension": "~4.3.4",
"@jupyterlab/debugger-extension": "~4.3.4",
"@jupyterlab/docmanager-extension": "~4.3.4",
"@jupyterlab/documentsearch-extension": "~4.3.4",
"@jupyterlab/extensionmanager-extension": "~4.3.4",
"@jupyterlab/filebrowser-extension": "~4.3.4",
"@jupyterlab/fileeditor-extension": "~4.3.4",
"@jupyterlab/help-extension": "~4.3.4",
"@jupyterlab/htmlviewer-extension": "~4.3.4",
"@jupyterlab/hub-extension": "~4.3.4",
"@jupyterlab/imageviewer-extension": "~4.3.4",
"@jupyterlab/javascript-extension": "~4.3.4",
"@jupyterlab/json-extension": "~4.3.4",
"@jupyterlab/lsp": "~4.3.4",
"@jupyterlab/lsp-extension": "~4.3.4",
"@jupyterlab/mainmenu-extension": "~4.3.4",
"@jupyterlab/markdownviewer-extension": "~4.3.4",
"@jupyterlab/markedparser-extension": "~4.3.4",
"@jupyterlab/mathjax-extension": "~4.3.4",
"@jupyterlab/mermaid-extension": "~4.3.4",
"@jupyterlab/metadataform-extension": "~4.3.4",
"@jupyterlab/notebook-extension": "~4.3.4",
"@jupyterlab/pdf-extension": "~4.3.4",
"@jupyterlab/pluginmanager-extension": "~4.3.4",
"@jupyterlab/running-extension": "~4.3.4",
"@jupyterlab/settingeditor": "~4.3.4",
"@jupyterlab/settingeditor-extension": "~4.3.4",
"@jupyterlab/shortcuts-extension": "~5.1.4",
"@jupyterlab/terminal-extension": "~4.3.4",
"@jupyterlab/theme-dark-extension": "~4.3.4",
"@jupyterlab/theme-dark-high-contrast-extension": "~4.3.4",
"@jupyterlab/theme-light-extension": "~4.3.4",
"@jupyterlab/toc-extension": "~6.3.4",
"@jupyterlab/tooltip-extension": "~4.3.4",
"@jupyterlab/translation-extension": "~4.3.4",
"@jupyterlab/ui-components-extension": "~4.3.4",
"@jupyterlab/vega5-extension": "~4.3.4",
"@jupyterlab/application-extension": "~4.4.0-alpha.1",
"@jupyterlab/apputils-extension": "~4.4.0-alpha.1",
"@jupyterlab/attachments": "~4.4.0-alpha.1",
"@jupyterlab/cell-toolbar-extension": "~4.4.0-alpha.1",
"@jupyterlab/celltags-extension": "~4.4.0-alpha.1",
"@jupyterlab/codemirror": "~4.4.0-alpha.1",
"@jupyterlab/codemirror-extension": "~4.4.0-alpha.1",
"@jupyterlab/completer-extension": "~4.4.0-alpha.1",
"@jupyterlab/console-extension": "~4.4.0-alpha.1",
"@jupyterlab/coreutils": "~6.4.0-alpha.1",
"@jupyterlab/csvviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/debugger-extension": "~4.4.0-alpha.1",
"@jupyterlab/docmanager-extension": "~4.4.0-alpha.1",
"@jupyterlab/documentsearch-extension": "~4.4.0-alpha.1",
"@jupyterlab/extensionmanager-extension": "~4.4.0-alpha.1",
"@jupyterlab/filebrowser-extension": "~4.4.0-alpha.1",
"@jupyterlab/fileeditor-extension": "~4.4.0-alpha.1",
"@jupyterlab/help-extension": "~4.4.0-alpha.1",
"@jupyterlab/htmlviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/hub-extension": "~4.4.0-alpha.1",
"@jupyterlab/imageviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/javascript-extension": "~4.4.0-alpha.1",
"@jupyterlab/json-extension": "~4.4.0-alpha.1",
"@jupyterlab/lsp": "~4.4.0-alpha.1",
"@jupyterlab/lsp-extension": "~4.4.0-alpha.1",
"@jupyterlab/mainmenu-extension": "~4.4.0-alpha.1",
"@jupyterlab/markdownviewer-extension": "~4.4.0-alpha.1",
"@jupyterlab/markedparser-extension": "~4.4.0-alpha.1",
"@jupyterlab/mathjax-extension": "~4.4.0-alpha.1",
"@jupyterlab/mermaid-extension": "~4.4.0-alpha.1",
"@jupyterlab/metadataform-extension": "~4.4.0-alpha.1",
"@jupyterlab/notebook-extension": "~4.4.0-alpha.1",
"@jupyterlab/pdf-extension": "~4.4.0-alpha.1",
"@jupyterlab/pluginmanager-extension": "~4.4.0-alpha.1",
"@jupyterlab/running-extension": "~4.4.0-alpha.1",
"@jupyterlab/settingeditor": "~4.4.0-alpha.1",
"@jupyterlab/settingeditor-extension": "~4.4.0-alpha.1",
"@jupyterlab/shortcuts-extension": "~5.2.0-alpha.1",
"@jupyterlab/terminal-extension": "~4.4.0-alpha.1",
"@jupyterlab/theme-dark-extension": "~4.4.0-alpha.1",
"@jupyterlab/theme-dark-high-contrast-extension": "~4.4.0-alpha.1",
"@jupyterlab/theme-light-extension": "~4.4.0-alpha.1",
"@jupyterlab/toc-extension": "~6.4.0-alpha.1",
"@jupyterlab/tooltip-extension": "~4.4.0-alpha.1",
"@jupyterlab/translation-extension": "~4.4.0-alpha.1",
"@jupyterlab/ui-components-extension": "~4.4.0-alpha.1",
"@jupyterlab/vega5-extension": "~4.4.0-alpha.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/builder": "~4.3.4",
"@jupyterlab/buildutils": "~4.3.4",
"@jupyterlab/builder": "~4.4.0-alpha.1",
"@jupyterlab/buildutils": "~4.4.0-alpha.1",
"@types/rimraf": "^3.0.2",
"css-loader": "~5.0.1",
"extra-watch-webpack-plugin": "^1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "~4.3.4",
"@jupyterlab/buildutils": "~4.4.0-alpha.1",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~5.0.2"
Expand Down
10 changes: 10 additions & 0 deletions buildutils/src/upgrade-lab-dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,16 @@ async function updatePackageJson(newVersion: string): Promise<void> {
throw new Error(errorMessage);
}

// fetch the new galata version
const galataUrl = `https://raw.githubusercontent.com/jupyterlab/jupyterlab/v${newVersion}/galata/package.json`;
const galataResponse = await fetch(galataUrl);
if (!galataResponse.ok) {
const errorMessage = `Failed to fetch galata/package.json from ${galataUrl}. HTTP status code: ${galataResponse.status}`;
throw new Error(errorMessage);
}

const newPackageJson = await response.json();
const galataPackageJson = await galataResponse.json();

for (const packageJsonPath of PACKAGE_JSON_PATHS) {
const filePath: string = path.resolve(packageJsonPath);
Expand All @@ -87,6 +96,7 @@ async function updatePackageJson(newVersion: string): Promise<void> {
const newDependencies = {
...newPackageJson.devDependencies,
...newPackageJson.resolutions,
'@jupyterlab/galata': galataPackageJson.version,
};

updateDependencyVersion(existingPackageJson, newDependencies);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/buildutils": "~4.3.4",
"@jupyterlab/buildutils": "~4.4.0-alpha.1",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"eslint": "^8.36.0",
Expand Down
Loading
Loading