Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
jtpio authored Apr 2, 2024
2 parents 6bc6f89 + 3b8e673 commit 068a8b6
Show file tree
Hide file tree
Showing 25 changed files with 1,783 additions and 1,937 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
with:
ignore_links: 'https://playwright.dev/docs/test-cli/ https://blog.jupyter.org/the-big-split-9d7b88a031a7 https://blog.jupyter.org/jupyter-ascending-1bf5b362d97e https://mybinder.org/v2/gh/jupyter/notebook/main https://nbviewer.jupyter.org https://stackoverflow.com'
ignore_links: 'https://playwright.dev/docs/test-cli/ https://blog.jupyter.org/the-big-split-9d7b88a031a7 https://blog.jupyter.org/jupyter-ascending-1bf5b362d97e https://mybinder.org/v2/gh/jupyter/notebook/main https://nbviewer.jupyter.org https://stackoverflow.com https://github.com/[^/]+/?$'
ignore_glob: 'ui-tests/test/notebooks/*'

test_lint:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildutils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.1.1,<4.2" hatch
python -m pip install -U "jupyterlab>=4.2.0a2,<4.3" hatch
jlpm
jlpm run build
Expand Down Expand Up @@ -79,6 +79,6 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.1.1,<4.2" pip
python -m pip install -U "jupyterlab>=4.2.0a2,<4.3" pip
jlpm
jlpm run build
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
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.1.1,<4.2"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.2.0a2,<4.3"]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: 'v1.10.0'
Expand Down
22 changes: 20 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,26 @@ increasing awareness of the notebook state and enabling users to quickly navigat

<!-- <START NEW CHANGELOG ENTRY> -->

## 7.2.0a0

([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.1.2...80b582bce69e33e36e936af2ea981bcb22a4d285))

### Enhancements made

- Update to JupyterLab 4.2.0a2 [#7307](https://github.com/jupyter/notebook/pull/7307) ([@jtpio](https://github.com/jtpio))

### Maintenance and upkeep improvements

- Ignore links to GitHub user and organisation profiles [#7308](https://github.com/jupyter/notebook/pull/7308) ([@jtpio](https://github.com/jtpio))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/jupyter/notebook/graphs/contributors?from=2024-03-14&to=2024-03-29&type=c))

[@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2024-03-14..2024-03-29&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2024-03-14..2024-03-29&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 7.1.2

([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.1.1...ca41222a9c8d75356c6d67d3bd36e34d71cce2d8))
Expand All @@ -128,8 +148,6 @@ increasing awareness of the notebook state and enabling users to quickly navigat

[@blink1073](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ablink1073+updated%3A2024-02-26..2024-03-14&type=Issues) | [@brichet](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Abrichet+updated%3A2024-02-26..2024-03-14&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2024-02-26..2024-03-14&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2024-02-26..2024-03-14&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 7.1.1

([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.1.0...da7b8d400e96ceff0eec834badd891bc5d5f154d))
Expand Down
318 changes: 161 additions & 157 deletions app/package.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions buildutils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/buildutils",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"private": true,
"description": "Jupyter Notebook - Build Utilities",
"homepage": "https://github.com/jupyter/notebook",
Expand Down Expand Up @@ -29,7 +29,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "~4.1.5",
"@jupyterlab/buildutils": "~4.2.0-alpha.2",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"typescript": "~5.0.2"
Expand Down
2 changes: 1 addition & 1 deletion notebook/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from collections import namedtuple

# Use "hatch version xx.yy.zz" to handle version changes
__version__ = "7.1.2"
__version__ = "7.2.0a0"

# PEP440 version parser
_version_regex = re.compile(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/buildutils": "~4.1.5",
"@jupyterlab/buildutils": "~4.2.0-alpha.2",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"eslint": "^8.36.0",
Expand Down
26 changes: 13 additions & 13 deletions packages/_metapackage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/metapackage",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"private": true,
"description": "Jupyter Notebook - Metapackage",
"homepage": "https://github.com/jupyter/notebook",
Expand All @@ -20,18 +20,18 @@
"watch": "tsc -b -w --preserveWatchOutput"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyter-notebook/application-extension": "^7.1.2",
"@jupyter-notebook/console-extension": "^7.1.2",
"@jupyter-notebook/docmanager-extension": "^7.1.2",
"@jupyter-notebook/documentsearch-extension": "^7.1.2",
"@jupyter-notebook/help-extension": "^7.1.2",
"@jupyter-notebook/lab-extension": "^7.1.2",
"@jupyter-notebook/notebook-extension": "^7.1.2",
"@jupyter-notebook/terminal-extension": "^7.1.2",
"@jupyter-notebook/tree": "^7.1.2",
"@jupyter-notebook/tree-extension": "^7.1.2",
"@jupyter-notebook/ui-components": "^7.1.2"
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyter-notebook/application-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/console-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/docmanager-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/documentsearch-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/help-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/lab-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/notebook-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/terminal-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/tree": "^7.2.0-alpha.0",
"@jupyter-notebook/tree-extension": "^7.2.0-alpha.0",
"@jupyter-notebook/ui-components": "^7.2.0-alpha.0"
},
"devDependencies": {
"typescript": "~5.0.2"
Expand Down
30 changes: 15 additions & 15 deletions packages/application-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/application-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Application Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -38,22 +38,22 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyter-notebook/ui-components": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/apputils": "~4.2.5",
"@jupyterlab/codeeditor": "~4.1.5",
"@jupyterlab/console": "~4.1.5",
"@jupyterlab/coreutils": "~6.1.5",
"@jupyterlab/docmanager": "~4.1.5",
"@jupyterlab/docregistry": "~4.1.5",
"@jupyterlab/mainmenu": "~4.1.5",
"@jupyterlab/rendermime": "~4.1.5",
"@jupyterlab/settingregistry": "~4.1.5",
"@jupyterlab/translation": "~4.1.5",
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/codeeditor": "~4.2.0-alpha.2",
"@jupyterlab/console": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docmanager": "~4.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/mainmenu": "~4.2.0-alpha.2",
"@jupyterlab/rendermime": "~4.2.0-alpha.2",
"@jupyterlab/settingregistry": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@lumino/coreutils": "^2.1.2",
"@lumino/disposable": "^2.1.2",
"@lumino/widgets": "^2.3.1"
"@lumino/widgets": "^2.3.2"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
16 changes: 8 additions & 8 deletions packages/application/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/application",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Application",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -42,22 +42,22 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/coreutils": "~6.1.5",
"@jupyterlab/docregistry": "~4.1.5",
"@jupyterlab/rendermime-interfaces": "~3.9.5",
"@jupyterlab/ui-components": "~4.1.5",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/rendermime-interfaces": "~3.10.0-alpha.2",
"@jupyterlab/ui-components": "~4.2.0-alpha.2",
"@lumino/algorithm": "^2.0.1",
"@lumino/coreutils": "^2.1.2",
"@lumino/messaging": "^2.0.1",
"@lumino/polling": "^2.1.2",
"@lumino/signaling": "^2.1.2",
"@lumino/widgets": "^2.3.1"
"@lumino/widgets": "^2.3.2"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.12.1",
"@jupyterlab/testutils": "~4.1.5",
"@jupyterlab/testutils": "~4.2.0-alpha.2",
"@types/jest": "^29.2.5",
"jest": "^29.3.1",
"rimraf": "^3.0.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/console-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/console-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Console Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -38,10 +38,10 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/console": "~4.1.5",
"@jupyterlab/coreutils": "~6.1.5",
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/console": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@lumino/algorithm": "^2.0.1"
},
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions packages/docmanager-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/docmanager-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Document Manager Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -38,12 +38,12 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/coreutils": "~6.1.5",
"@jupyterlab/docmanager": "~4.1.5",
"@jupyterlab/docregistry": "~4.1.5",
"@jupyterlab/services": "~7.1.5",
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docmanager": "~4.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/services": "~7.2.0-alpha.2",
"@lumino/algorithm": "^2.0.1",
"@lumino/signaling": "^2.1.2"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/documentsearch-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/documentsearch-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Document Search Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -38,10 +38,10 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/documentsearch": "~4.1.5",
"@lumino/widgets": "^2.3.1"
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/documentsearch": "~4.2.0-alpha.2",
"@lumino/widgets": "^2.3.2"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/help-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/help-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Help Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -38,11 +38,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter-notebook/ui-components": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/apputils": "~4.2.5",
"@jupyterlab/mainmenu": "~4.1.5",
"@jupyterlab/translation": "~4.1.5",
"@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/mainmenu": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
22 changes: 11 additions & 11 deletions packages/lab-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/lab-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Lab Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -43,19 +43,19 @@
"watch:src": "tsc -w"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/apputils": "~4.2.5",
"@jupyterlab/coreutils": "~6.1.5",
"@jupyterlab/docregistry": "~4.1.5",
"@jupyterlab/notebook": "~4.1.5",
"@jupyterlab/translation": "~4.1.5",
"@jupyterlab/ui-components": "~4.1.5",
"@lumino/commands": "^2.2.0",
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/coreutils": "~6.2.0-alpha.2",
"@jupyterlab/docregistry": "~4.2.0-alpha.2",
"@jupyterlab/notebook": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@jupyterlab/ui-components": "~4.2.0-alpha.2",
"@lumino/commands": "^2.3.0",
"@lumino/disposable": "^2.1.2"
},
"devDependencies": {
"@jupyterlab/builder": "~4.1.5",
"@jupyterlab/builder": "~4.2.0-alpha.2",
"rimraf": "^3.0.2",
"typescript": "~5.0.2"
},
Expand Down
20 changes: 10 additions & 10 deletions packages/notebook-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-notebook/notebook-extension",
"version": "7.1.2",
"version": "7.2.0-alpha.0",
"description": "Jupyter Notebook - Notebook Extension",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
Expand Down Expand Up @@ -38,16 +38,16 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter-notebook/application": "^7.1.2",
"@jupyterlab/application": "~4.1.5",
"@jupyterlab/apputils": "~4.2.5",
"@jupyterlab/cells": "~4.1.5",
"@jupyterlab/docmanager": "~4.1.5",
"@jupyterlab/notebook": "~4.1.5",
"@jupyterlab/settingregistry": "~4.1.5",
"@jupyterlab/translation": "~4.1.5",
"@jupyter-notebook/application": "^7.2.0-alpha.0",
"@jupyterlab/application": "~4.2.0-alpha.2",
"@jupyterlab/apputils": "~4.3.0-alpha.2",
"@jupyterlab/cells": "~4.2.0-alpha.2",
"@jupyterlab/docmanager": "~4.2.0-alpha.2",
"@jupyterlab/notebook": "~4.2.0-alpha.2",
"@jupyterlab/settingregistry": "~4.2.0-alpha.2",
"@jupyterlab/translation": "~4.2.0-alpha.2",
"@lumino/polling": "^2.1.2",
"@lumino/widgets": "^2.3.1",
"@lumino/widgets": "^2.3.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Loading

0 comments on commit 068a8b6

Please sign in to comment.