From a4e24c313f60364c59a3c7e16039d6807dafa312 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <510760+vidartf@users.noreply.github.com>
Date: Fri, 12 Aug 2022 15:50:00 +0100
Subject: [PATCH 1/5] Re-enable JS side support for older widgets

Was previously disabled to force the install of RC during testing
---
 js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/package.json b/js/package.json
index e7f17d8c..59f8f0a0 100644
--- a/js/package.json
+++ b/js/package.json
@@ -34,7 +34,7 @@
     "watch": "webpack --mode development -w"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.0-rc.0",
+    "@jupyter-widgets/base": "^1.2.5 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^6.0.0-rc.0",
     "bluebird": "^3.5.5",
     "jupyter-dataserializers": "^3.0.0",
     "three": "^0.97.0",

From 8d81bb864f231ea2bf333e51263b30d31130e43a Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <510760+vidartf@users.noreply.github.com>
Date: Fri, 12 Aug 2022 16:48:55 +0100
Subject: [PATCH 2/5] Fix display for canvas

If not set to "block", we get a 5px gap at the bottom.
Ref https://stackoverflow.com/questions/15807833/div-containing-canvas-have-got-a-strange-bottom-margin-of-5px
---
 js/src/_base/Renderable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/_base/Renderable.js b/js/src/_base/Renderable.js
index a284f282..a5695ff4 100644
--- a/js/src/_base/Renderable.js
+++ b/js/src/_base/Renderable.js
@@ -423,7 +423,7 @@ class RenderableView extends widgets.DOMWidgetView {
         this.$renderer = $(this.renderer.domElement);
         this.$el.empty().append(this.$renderer);
 
-        this.$el.css('margin-bottom', '-5px');
+        this.$el.css('display', 'block');
 
         this.updateSize();
 

From abe507f0ad4e7fa1984c50220d7a81ad1efab04b Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <510760+vidartf@users.noreply.github.com>
Date: Fri, 12 Aug 2022 16:55:37 +0100
Subject: [PATCH 3/5] Update ci.yml

---
 .github/workflows/ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a222249e..92bddd62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -138,19 +138,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
-        python: [3.6, 3.7, 3.8, 3.9]
+        python: [3.7, 3.8, 3.9, 3.10]
         include:
-          - python: 3.6
-            dist: 'pythreejs*.tar.gz'
           - python: 3.7
-            dist: 'pythreejs*.whl'
+            dist: 'pythreejs*.tar.gz'
+            node: 12
             lab: 1
-            node: 10
           - python: 3.8
             dist: 'pythreejs*.whl'
-            lab: 2
             node: 14
+            lab: 2
           - python: 3.9
+            node: 16
+            dist: 'pythreejs*.whl'
+            lab: 3
+          - python: 3.10
             dist: 'pythreejs*.whl'
             lab: 3
           - os: windows

From 9f50e38672530bf67c8167293d2f341780d80eaf Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <510760+vidartf@users.noreply.github.com>
Date: Fri, 12 Aug 2022 18:13:11 +0100
Subject: [PATCH 4/5] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92bddd62..bb01abd7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
         include:
           - python: 3.7
             dist: 'pythreejs*.tar.gz'
-            node: 12
+            node: 14
             lab: 1
           - python: 3.8
             dist: 'pythreejs*.whl'

From bd5f850f53862f835556eee9dfabcc07469deb29 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Mon, 15 Aug 2022 10:06:24 +0100
Subject: [PATCH 5/5] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb01abd7..6051d505 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
           - python: 3.7
             dist: 'pythreejs*.tar.gz'
             node: 14
-            lab: 1
+            lab: 2
           - python: 3.8
             dist: 'pythreejs*.whl'
             node: 14