Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions js/lib/bqplot-gl-loader-classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ function loadBqplotGL() {
// this AMD-only prevents bqplot 0.12 from fetching bqplot-gl eagerly.
var amdRequire = typeof window !== "undefined" && (window.requirejs || window.require);
if(!amdRequire) {
return Promise.reject(new Error("bqplot-image-gl with bqplot 0.13 requires bqplot-gl. Install and enable bqplot-gl, or use bqplot 0.12."));
return Promise.reject(new Error("bqplot-image-gl loaded its classic bqplot-gl bridge without a RequireJS loader."));
}
return new Promise((resolve, reject) => {
amdRequire(["bqplot-gl"], resolve, () => {
reject(new Error("bqplot-image-gl with bqplot 0.13 requires bqplot-gl. Install and enable bqplot-gl, or use bqplot 0.12."));
reject(new Error("bqplot-image-gl with bqplot 0.13 requires bqplot-gl. Install bqplot-gl and enable its nbextension for classic frontends, or use bqplot 0.12."));
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion js/lib/bqplot-gl-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ function loadBqplotGL() {
// JupyterLab 4 resolves separately installed widget packages through
// module federation, so the labextension bundle must use dynamic import.
return import("bqplot-gl").catch(() => {
throw new Error("bqplot-image-gl with bqplot 0.13 requires bqplot-gl. Install and enable bqplot-gl, or use bqplot 0.12.");
throw new Error("bqplot-image-gl with bqplot 0.13 requires bqplot-gl. Install bqplot-gl so JupyterLab can load its labextension, or use bqplot 0.12.");
});
}

Expand Down
14 changes: 7 additions & 7 deletions js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0-rc.4 || ^4.0.0",
"bqplot-gl": "^0.1.0",
"bqplot-gl": "^0.1.1",
"npm-run-all": "^4.1.5",
"raw-loader": "^4",
"rimraf": "^6.1.3",
Expand All @@ -55,7 +55,7 @@
"three": "^0.97.0"
},
"peerDependencies": {
"bqplot-gl": ">=0.1.0 <0.2.0"
"bqplot-gl": ">=0.1.1 <0.2.0"
},
"peerDependenciesMeta": {
"bqplot-gl": {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"jupyterlab>=3.6",
"jupyterlab>=3.6,<4",
"hatchling",
"hatch-jupyter-builder>=0.5.0",
]
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ isolated_build = true

[testenv]
setenv =
bqplot013: SOLARA_TEST_RUNNERS = solara,jupyter_notebook
bqplot013: SOLARA_TEST_RUNNERS = solara,jupyter_notebook,jupyter_lab
changedir =
test: .tmp/{envname}
notebooks: examples
Expand All @@ -26,8 +26,8 @@ deps =
bqplot013: solara>=1.44.1
bqplot013: notebook<7
bqplot013: bqplot>=0.13,<0.14
bqplot013: bqplot-gl @ git+https://github.com/maartenbreddels/bqplot-gl.git@codex/export-webgl-figure-init
bqplot013: jupyterlab>=4,<5
bqplot013: bqplot-gl>=0.1.1
bqplot013: jupyterlab<4
extras =
test: test
notebooks: test
Expand Down
Loading