Skip to content

Commit 7605d25

Browse files
committed
JupyterLab 3 update
Signed-off-by: martinRenou <[email protected]>
1 parent b0cad1a commit 7605d25

File tree

10 files changed

+5545
-3434
lines changed

10 files changed

+5545
-3434
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, macos-latest]
19-
python-version: [3.6, 3.7, 3.8]
19+
python-version: [3.7, 3.8]
2020

2121
steps:
2222
- name: Checkout
@@ -30,16 +30,26 @@ jobs:
3030

3131
- name: Mamba install dependencies
3232
shell: bash -l {0}
33-
run: mamba install python=${{ matrix.python-version }} pip nodejs ipywidgets jupyter jupyterlab pillow numpy flake8
33+
run: mamba install python=${{ matrix.python-version }} pip nodejs ipywidgets=7.6 jupyter jupyterlab=3 pillow numpy flake8
3434

3535
- name: Install ipycanvas
3636
shell: bash -l {0}
3737
run: pip install -e .
3838

39-
- name: Install labextension (Only on Ubuntu for build speed)
40-
if: matrix.os == 'ubuntu-latest'
39+
- name: Check installation files
4140
shell: bash -l {0}
42-
run: jupyter labextension install .
41+
run: |
42+
test -d $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas
43+
test -f $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas/extension.js
44+
test -f $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas/index.js
45+
test -d $CONDA_PREFIX/share/jupyter/labextensions/ipycanvas
46+
test -f $CONDA_PREFIX/share/jupyter/labextensions/ipycanvas/package.json
47+
48+
- name: Check nbextension and labextension
49+
shell: bash -l {0}
50+
run: |
51+
jupyter nbextension list 2>&1 | grep -ie "ipycanvas/extension.*enabled" -
52+
jupyter labextension list 2>&1 | grep -ie "ipycanvas.*enabled.*ok" -
4353
4454
- name: Test flake8
4555
shell: bash -l {0}

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ instance/
6161

6262
# Sphinx documentation
6363
docs/_build/
64-
docs/source/_static/embed-bundle.js
65-
docs/source/_static/embed-bundle.js.map
64+
docs/source/_static/embed-bundle*
6665

6766
# PyBuilder
6867
target/
@@ -146,7 +145,6 @@ $RECYCLE.BIN/
146145

147146
**/node_modules/
148147
ipycanvas/nbextension/static/index.*
149-
ipycanvas/labextension/*.tgz
150148

151149
# Coverage data
152150
# -------------

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ include setupbase.py
66
include package.json
77
include tsconfig.json
88
include webpack.config.js
9-
include ipycanvas/labextension/*.tgz
109

1110
# Documentation
1211
graft docs
@@ -24,6 +23,7 @@ prune tests/build
2423

2524
# Javascript files
2625
graft ipycanvas/nbextension
26+
graft ipycanvas/labextension
2727
graft src
2828
prune **/node_modules
2929
prune coverage

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Or using `conda`:
3737
conda install -c conda-forge ipycanvas
3838
```
3939

40-
And if you use jupyterlab:
40+
And if you use jupyterlab <= 2:
4141

4242
```bash
4343
conda install -c conda-forge nodejs

0 commit comments

Comments
 (0)