Clean up extension spec version

Author: vidartf

js/src/_base/Renderable.js

@@ -6,6 +6,7 @@ var $ = require('jquery');
 var THREE = require('three');
 
 var pkgName = require('../../package.json').name;
+var EXTENSION_SPEC_VERSION = require('../../version').EXTENSION_SPEC_VERSION;
 var RendererPool = require('./RendererPool');
 
 var ThreeModel = require('./Three').ThreeModel;
@@ -16,8 +17,10 @@ var RenderableModel = widgets.DOMWidgetModel.extend({
         return _.extend(widgets.DOMWidgetModel.prototype.defaults.call(this), {
             _model_module: pkgName,
             _view_module: pkgName,
+            _model_module_version: EXTENSION_SPEC_VERSION,
             _model_name: 'RenderableModel',
             _view_name: 'RenderableView',
+            _view_module_version: EXTENSION_SPEC_VERSION,
 
             _width: 200,
             _height: 200,

js/src/_base/Three.js

@@ -10,7 +10,7 @@ var Enums = require('./enums');
 
 var utils = require('./utils');
 
-var version = require('../../package.json').version;
+var EXTENSION_SPEC_VERSION = require('../../version').EXTENSION_SPEC_VERSION;
 
 
 /**
@@ -59,7 +59,7 @@ var ThreeModel = widgets.WidgetModel.extend({
         return _.extend(widgets.WidgetModel.prototype.defaults.call(this), {
             _model_name: this.constructor.model_name,
             _model_module: this.constructor.model_module,
-            _model_version: this.constructor.model_module_version
+            _model_module_version: this.constructor.model_module_version
         });
     },
 
@@ -767,7 +767,7 @@ var ThreeModel = widgets.WidgetModel.extend({
 }, {
     model_module: 'jupyter-threejs',
     model_name: 'ThreeModel',
-    model_module_version: version,
+    model_module_version: EXTENSION_SPEC_VERSION,
 });
 
 module.exports = {

js/src/jupyterlab-plugin.js

@@ -8,7 +8,7 @@ module.exports = {
     activate: function(app, widgets) {
         widgets.registerWidget({
             name: 'jupyter-threejs',
-            version: jupyter_threejs.version,
+            version: jupyter_threejs.EXTENSION_SPEC_VERSION,
             exports: jupyter_threejs
         });
     },

js/src/version.js

@@ -0,0 +1,12 @@
+
+// Copyright (c) pythreejs Developers.
+// Distributed under the terms of the Modified BSD License.
+/**
+ * The version of the attribute spec that this package
+ * implements. This is the value used in
+ * _model_module_version/_view_module_version.
+ *
+ * Update this value when attributes are added/removed from
+ * the widget models, or if the serialized format changes.
+ */
+module.exports['EXTENSION_SPEC_VERSION'] = '1.0.0-beta.3';

pythreejs/_base/Three.py

@@ -2,14 +2,14 @@
 from traitlets import Unicode
 
 from .._package import npm_pkg_name
-from .._version import EXTENSION_VERSION
+from .._version import EXTENSION_SPEC_VERSION
 
 
 class ThreeWidget(Widget):
     """Base widget type for all pythreejs widgets"""
 
     _model_module = Unicode(npm_pkg_name).tag(sync=True)
-    _model_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
+    _model_module_version = Unicode(EXTENSION_SPEC_VERSION).tag(sync=True)
 
     _previewable = True
 

pythreejs/_base/renderable.py

@@ -2,7 +2,7 @@
 from traitlets import Unicode, CInt, CFloat, Enum, Bool, Instance, List
 
 from .._package import npm_pkg_name
-from .._version import EXTENSION_VERSION
+from .._version import EXTENSION_SPEC_VERSION
 
 from .Three import ThreeWidget
 from ..enums import ToneMappings
@@ -13,8 +13,8 @@
 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)
+    _view_module_version = Unicode(EXTENSION_SPEC_VERSION).tag(sync=True)
+    _model_module_version = Unicode(EXTENSION_SPEC_VERSION).tag(sync=True)
 
     # renderer properties
     _width = CInt(200).tag(sync=True)

pythreejs/_version.py

@@ -5,4 +5,10 @@
 __version__ = '%s.%s.%s%s'%(version_info[0], version_info[1], version_info[2],
           '' if version_info[3]=='final' else _specifier_[version_info[3]]+str(version_info[4]))
 
-EXTENSION_VERSION = '1.0.0-beta.3'
+# The version of the attribute spec that this package
+# implements. This is the value used in
+# _model_module_version/_view_module_version.
+#
+# Update this value when attributes are added/removed from
+# the widget models, or if the serialized format changes.
+EXTENSION_SPEC_VERSION = '1.0.0-beta.3'

pythreejs/animation/AnimationAction.py

@@ -2,7 +2,7 @@
 from traitlets import Unicode, Union, CInt, CFloat
 
 from .._package import npm_pkg_name
-from .._version import EXTENSION_VERSION
+from .._version import EXTENSION_SPEC_VERSION
 
 from .._base.Three import ThreeWidget
 from .AnimationAction_autogen import AnimationAction as AnimationActionBase
@@ -16,7 +16,7 @@ class AnimationAction(AnimationActionBase, DOMWidget):
     """
     _view_name = Unicode('AnimationActionView').tag(sync=True)
     _view_module = Unicode(npm_pkg_name).tag(sync=True)
-    _view_module_version = Unicode(EXTENSION_VERSION).tag(sync=True)
+    _view_module_version = Unicode(EXTENSION_SPEC_VERSION).tag(sync=True)
 
     _previewable = False
 

pythreejs/pythreejs.py

@@ -16,7 +16,7 @@
 import numpy as np
 
 from ._package import npm_pkg_name
-from ._version import EXTENSION_VERSION
+from ._version import EXTENSION_SPEC_VERSION
 
 
 from .core.BufferAttribute import BufferAttribute