Skip to content

Commit 33a8aaf

Browse files
authored
Merge pull request #382 from vidartf/ipyw8
Re-enable JS side support for older widgets
2 parents 2d18cd4 + bd5f850 commit 33a8aaf

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/ci.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,21 @@ jobs:
138138
fail-fast: false
139139
matrix:
140140
os: [ubuntu, macos, windows]
141-
python: [3.6, 3.7, 3.8, 3.9]
141+
python: [3.7, 3.8, 3.9, 3.10]
142142
include:
143-
- python: 3.6
144-
dist: 'pythreejs*.tar.gz'
145143
- python: 3.7
146-
dist: 'pythreejs*.whl'
147-
lab: 1
148-
node: 10
144+
dist: 'pythreejs*.tar.gz'
145+
node: 14
146+
lab: 2
149147
- python: 3.8
150148
dist: 'pythreejs*.whl'
151-
lab: 2
152149
node: 14
150+
lab: 2
153151
- python: 3.9
152+
node: 16
153+
dist: 'pythreejs*.whl'
154+
lab: 3
155+
- python: 3.10
154156
dist: 'pythreejs*.whl'
155157
lab: 3
156158
- os: windows

js/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"watch": "webpack --mode development -w"
3535
},
3636
"dependencies": {
37-
"@jupyter-widgets/base": "^6.0.0-rc.0",
37+
"@jupyter-widgets/base": "^1.2.5 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^6.0.0-rc.0",
3838
"bluebird": "^3.5.5",
3939
"jupyter-dataserializers": "^3.0.0",
4040
"three": "^0.97.0",

js/src/_base/Renderable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class RenderableView extends widgets.DOMWidgetView {
423423
this.$renderer = $(this.renderer.domElement);
424424
this.$el.empty().append(this.$renderer);
425425

426-
this.$el.css('margin-bottom', '-5px');
426+
this.$el.css('display', 'block');
427427

428428
this.updateSize();
429429

0 commit comments

Comments
 (0)