Merge stragglers

Author: vidartf

jslab/package.json

@@ -10,7 +10,7 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@jupyter-widgets/jupyterlab-manager": "^0.23.2",
-    "jupyter-threejs": "^0.3.0-alpha.0"
+    "jupyter-threejs": "^0.4.0-alpha.0"
   },
   "jupyterlab": {
     "extension": true

pythreejs/_base/Three.py

@@ -2,10 +2,14 @@
 from traitlets import Unicode, CInt, Bool, Instance
 from .._package import npm_pkg_name
 
+from .._version import EXTENSION_VERSION
+
 
 class RenderableWidget(DOMWidget):
     _view_module = Unicode(npm_pkg_name).tag(sync=True)
     _model_module = Unicode(npm_pkg_name).tag(sync=True)
+    _view_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
+    _model_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
 
     # renderer properties
     _width = CInt(200).tag(sync=True)
@@ -36,6 +40,7 @@ def freeze(self):
 
 class ThreeWidget(Widget):
     _model_module = Unicode(npm_pkg_name).tag(sync=True)
+    _model_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
 
     def __init__(self, **kwargs):
         super(ThreeWidget, self).__init__(**kwargs)

pythreejs/pythreejs.py

@@ -20,6 +20,7 @@
 
 from ._package import npm_pkg_name
 from .enums import Shading, Colors
+from ._version import EXTENSION_VERSION
 
 
 from .core.Object3D import Object3D
@@ -48,7 +49,6 @@ def vector2(trait_type=CFloat, default=None, **kwargs):
         default = [0, 0]
     return List(trait_type, default_value=default, minlen=2, maxlen=2, **kwargs)
 
-PYTHREEJS_VERSION='0.4.0-alpha.0'
 
 class ScaledObject(Object3D):
     """
@@ -212,8 +212,8 @@ def flatten(ll):
 class Effect(Widget):
     _view_module = Unicode(npm_pkg_name).tag(sync=True)
     _model_module = Unicode(npm_pkg_name).tag(sync=True)
-    _model_module_version = Unicode(PYTHREEJS_VERSION).tag(sync=True)
-    _view_module_version = Unicode(PYTHREEJS_VERSION).tag(sync=True)
+    _model_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
+    _view_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
 
 
 class AnaglyphEffect(Effect):