Skip to content

Commit bbd8d2f

Browse files
committed
Fix Build workflow
1 parent 3aae241 commit bbd8d2f

File tree

5 files changed

+27
-26
lines changed

5 files changed

+27
-26
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
uses: actions/checkout@v2
1515

1616
- name: Base Setup
17-
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
17+
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
1818

1919
- name: Install dependencies
20-
run: python -m pip install -U jupyterlab~=3.1 check-manifest
20+
run: python -m pip install -U check-manifest jupyterlab --pre
2121

2222
- name: Build the extension
2323
run: |
@@ -26,6 +26,7 @@ jobs:
2626
jlpm run eslint:check
2727
python -m pip install .
2828
29+
jupyter labextension list
2930
jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly.*OK"
3031
python -m jupyterlab.browser_check
3132
@@ -64,6 +65,6 @@ jobs:
6465
sudo rm -rf $(which node)
6566
sudo rm -rf $(which node)
6667
pip install myextension.tar.gz
67-
pip install jupyterlab
68+
pip install jupyterlab --pre
6869
jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly.*OK"
69-
python -m jupyterlab.browser_check --no-chrome-test
70+
python -m jupyterlab.browser_check --no-browser-test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Repo: https://github.com/google/blockly
1313

1414
## Requirements
1515

16-
* JupyterLab >= 3.0
16+
* JupyterLab >= 4.0.0a0
1717

1818
## Install
1919

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"jupyter-releaser": {
8585
"hooks": {
8686
"before-build-npm": [
87-
"python -m pip install jupyterlab~=3.1",
87+
"python -m pip install jupyterlab --pre",
8888
"jlpm"
8989
]
9090
}

src/layout.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ export class BlocklyLayout extends PanelLayout {
3939
// and the output area to render the execution replies.
4040
this._host = document.createElement('div');
4141

42-
// Creating a SimplifiedOutputArea widget to render the
42+
// Creating a SimplifiedOutputArea widget to render the
4343
// outputs from the execution reply.
44-
this._outputArea= new SimplifiedOutputArea({
44+
this._outputArea = new SimplifiedOutputArea({
4545
model: new OutputAreaModel({ trusted: true }),
4646
rendermime
4747
});
@@ -99,11 +99,11 @@ export class BlocklyLayout extends PanelLayout {
9999
// Execute the code using the kernel, by using a static method from the
100100
// same class to make an execution request.
101101
SimplifiedOutputArea.execute(code, this._outputArea, this._sessionContext)
102-
.then(resp => {
103-
this.addWidget(this._outputArea);
104-
this._resizeWorkspace();
105-
})
106-
.catch(e => console.error(e));
102+
.then(resp => {
103+
this.addWidget(this._outputArea);
104+
this._resizeWorkspace();
105+
})
106+
.catch(e => console.error(e));
107107
}
108108

109109
/**
@@ -130,7 +130,7 @@ export class BlocklyLayout extends PanelLayout {
130130
/**
131131
* Handle `after-attach` messages sent to the widget.
132132
*/
133-
protected onAfterAttach(msg: Message): void {
133+
protected onAfterAttach(msg: Message): void {
134134
//inject Blockly with appropiate JupyterLab theme.
135135
this._workspace = Blockly.inject(this._host, {
136136
toolbox: this._manager.toolbox,

src/utils.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -354,18 +354,18 @@ export const TOOLBOX = {
354354

355355
// Defining a Blockly Theme in accordance with the current JupyterLab Theme.
356356
const jupyterlab_theme = Blockly.Theme.defineTheme('jupyterlab', {
357-
'base': Blockly.Themes.Classic,
358-
'componentStyles': {
359-
'workspaceBackgroundColour': 'var(--jp-layout-color0)',
360-
'toolboxBackgroundColour': 'var(--jp-layout-color2)',
361-
'toolboxForegroundColour': 'var(--jp-ui-font-color0)',
362-
'flyoutBackgroundColour': 'var(--jp-border-color2)',
363-
'flyoutForegroundColour': 'var(--jp-layout-color3)',
364-
'flyoutOpacity': 1,
365-
'scrollbarColour': 'var(--jp-border-color0)',
366-
'insertionMarkerOpacity': 0.3,
367-
'scrollbarOpacity': 0.4,
368-
'cursorColour': 'var(--jp-scrollbar-background-color)',
357+
base: Blockly.Themes.Classic,
358+
componentStyles: {
359+
workspaceBackgroundColour: 'var(--jp-layout-color0)',
360+
toolboxBackgroundColour: 'var(--jp-layout-color2)',
361+
toolboxForegroundColour: 'var(--jp-ui-font-color0)',
362+
flyoutBackgroundColour: 'var(--jp-border-color2)',
363+
flyoutForegroundColour: 'var(--jp-layout-color3)',
364+
flyoutOpacity: 1,
365+
scrollbarColour: 'var(--jp-border-color0)',
366+
insertionMarkerOpacity: 0.3,
367+
scrollbarOpacity: 0.4,
368+
cursorColour: 'var(--jp-scrollbar-background-color)'
369369
}
370370
});
371371

0 commit comments

Comments
 (0)