Update frontend version to 0.1.1 and remove some duplication

jonmmease · jonmmease · commit ee26008244cb · 2018-06-27T09:36:39.000-04:00
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plotlywidget",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "The plotly.py ipywidgets library",
   "author": "The plotly.py team",
   "license": "MIT",
diff --git a/js/src/Figure.js b/js/src/Figure.js
@@ -2,6 +2,7 @@ var widgets = require("@jupyter-widgets/base");
 var _ = require("lodash");
 var Plotly = require("plotly.js/dist/plotly");
 var PlotlyIndex = require("plotly.js/src/lib/index");
+var semver_range = "^" + require("../package.json").version;
 
 // Model
 // =====
@@ -22,8 +23,8 @@ var FigureModel = widgets.DOMWidgetModel.extend({
         _view_name: "FigureView",
         _model_module: "plotlywidget",
         _view_module: "plotlywidget",
-        _view_module_version: "0.1.0",
-        _model_module_version: "0.1.0",
+        _view_module_version: semver_range,
+        _model_module_version: semver_range,
 
         // Data and Layout
         // ---------------
diff --git a/plotly/basewidget.py b/plotly/basewidget.py
@@ -13,7 +13,7 @@
 from .callbacks import (BoxSelector, LassoSelector,
                         InputDeviceState, Points)
 from .serializers import custom_serializers
-
+from .version import __frontend_version__
 
 @widgets.register()
 class BaseFigureWidget(BaseFigure, widgets.DOMWidget):
@@ -28,11 +28,11 @@ class BaseFigureWidget(BaseFigure, widgets.DOMWidget):
     # JavaScript object
     _view_name = Unicode('FigureView').tag(sync=True)
     _view_module = Unicode('plotlywidget').tag(sync=True)
-    _view_module_version = Unicode('0.1.0').tag(sync=True)
+    _view_module_version = Unicode(__frontend_version__).tag(sync=True)
 
     _model_name = Unicode('FigureModel').tag(sync=True)
     _model_module = Unicode('plotlywidget').tag(sync=True)
-    _model_module_version = Unicode('0.1.0').tag(sync=True)
+    _model_module_version = Unicode(__frontend_version__).tag(sync=True)
 
     # ### _data and _layout ###
     # These properties store the current state of the traces and
diff --git a/plotly/version.py b/plotly/version.py
@@ -1 +1,2 @@
 __version__ = '3.0.0rc9'
+__frontend_version__ = '^0.1.1'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "plotlywidget",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.1.1",`
`4`	`4`	`"description": "The plotly.py ipywidgets library",`
`5`	`5`	`"author": "The plotly.py team",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`__version__ = '3.0.0rc9'`
	`2`	`+__frontend_version__ = '^0.1.1'`