Skip to content

Commit 33be5fd

Browse files
authored
Merge branch 'jupyterlab:master' into add-lsp
2 parents c12f66c + 65adb87 commit 33be5fd

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build
22

33
on:
44
push:
5-
branches: main
5+
branches: master
66
pull_request:
77
branches: '*'
88

.github/workflows/check-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Check Release
22
on:
33
push:
44
branches:
5-
- main
5+
- master
66
pull_request:
77
branches:
8-
- main
8+
- master
99

1010
permissions:
1111
contents: write

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Changelog
2+
3+
<!-- <START NEW CHANGELOG ENTRY> -->
4+
5+
<!-- <END NEW CHANGELOG ENTRY> -->

MANIFEST.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
include LICENSE
2-
include README.md
3-
include RELEASE.md
2+
include *.md
43
include pyproject.toml
54

65
include package.json

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pip install jupyterlab-plugin-playground
1515

1616
## How to use the Plugin Playground
1717

18-
This extension provides a new command, `Load current file as extension`, available in the text editor.
18+
This extension provides a new command, `Load Current File As Extension`, available in the text editor.
1919

2020
As an example, open the text editor by creating a new text file and paste this small JupyterLab plugin into it. This plugin will create a simple command `My Super Cool Toggle` in the command palette that can be toggled on and off.
2121

@@ -46,7 +46,7 @@ As an example, open the text editor by creating a new text file and paste this s
4646
}
4747
}
4848
```
49-
While in the text editor, load this plugin in JupyterLab by invoking the Command Palette and executing `Load current file as extension`. Invoke the Command Palette again and you will see a new command "My Super Cool Toggle". Executing this new command will toggle the checkbox next to the command.
49+
While in the text editor, load this plugin in JupyterLab by invoking the Command Palette and executing `Load Current File As Extension`. Invoke the Command Palette again and you will see a new command "My Super Cool Toggle". Executing this new command will toggle the checkbox next to the command.
5050

5151
As another more advanced example, we load the [bqplot](https://bqplot.readthedocs.io) Jupyter Widget library from the cloud using RequireJS. This assumes you have the [ipywidgets JupyterLab extension](https://ipywidgets.readthedocs.io/en/stable/user_install.html#installing-in-jupyterlab-3-0) installed.
5252

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
7777
const commandID =
7878
'@jupyterlab/plugin-playground:LoadCurrentFileAsExtension';
7979
app.commands.addCommand(commandID, {
80-
label: 'Load current file as extension',
80+
label: 'Load Current File As Extension',
8181
isEnabled: () =>
8282
editorTracker.currentWidget !== null &&
8383
editorTracker.currentWidget === app.shell.currentWidget,

0 commit comments

Comments
 (0)