Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Frontend version #458

Merged
merged 2 commits into from Mar 17, 2017
Merged

Frontend version #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
090b471
Add module_version
SylvainCorlay Mar 13, 2017
b2d9b0c
Add semver ranges to bqplot models
SylvainCorlay Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions bqplot/_version.py
View file
Open in desktop
@@ -1,2 +1,3 @@
version_info = (0, 9, 0, 'b10')
__version__ = '.'.join(map(str, version_info))
__frontend_version__ = '^0.2.2'
3 changes: 3 additions & 0 deletions bqplot/axes.py
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@

from .scales import Scale, ColorScale
from .traits import array_serialization, array_dimension_bounds
from ._version import __frontend_version__


def register_axis(key=None):
Expand All @@ -53,6 +54,8 @@ class BaseAxis(Widget):
axis_types = {}
_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)


@register_axis('bqplot.Axis')
Expand Down
3 changes: 3 additions & 0 deletions bqplot/default_tooltip.py
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
"""
from ipywidgets import DOMWidget
from traitlets import Unicode, List, Bool
from ._version import __frontend_version__


class Tooltip(DOMWidget):
Expand Down Expand Up @@ -59,3 +60,5 @@ class Tooltip(DOMWidget):
_model_name = Unicode('TooltipModel').tag(sync=True)
_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)
3 changes: 3 additions & 0 deletions bqplot/figure.py
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@
from .interacts import Interaction
from .marks import Mark
from .axes import Axis
from ._version import __frontend_version__


@register('bqplot.Figure')
Expand Down Expand Up @@ -163,3 +164,5 @@ def _validate_aspect_ratio(self, proposal):
_model_name = Unicode('FigureModel').tag(sync=True)
_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)
4 changes: 4 additions & 0 deletions bqplot/interacts.py
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@
from .scales import Scale, DateScale
from .traits import Date, array_serialization
from .marks import Lines, Scatter
from ._version import __frontend_version__


def register_interaction(key=None):
Expand Down Expand Up @@ -85,6 +86,8 @@ class Interaction(Widget):

_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)
_ipython_display_ = None # We cannot display an interaction outside of a
# figure

Expand Down Expand Up @@ -226,6 +229,7 @@ class TwoDSelector(Selector):
**widget_serialization)
_model_name = Unicode('TwoDSelectorModel').tag(sync=True)


@register_interaction('bqplot.FastIntervalSelector')
class FastIntervalSelector(OneDSelector):

Expand Down
8 changes: 6 additions & 2 deletions bqplot/market_map.py
View file
Open in desktop
Expand Up @@ -29,11 +29,13 @@

from traitlets import Int, Unicode, List, Dict, Enum, Bool, Instance, Float
from traittypes import Array, DataFrame
from ipywidgets import (DOMWidget, CallbackDispatcher, Color,
widget_serialization, Layout)
from ipywidgets import (
DOMWidget, CallbackDispatcher, Color, widget_serialization, Layout
)

from .traits import array_serialization, dataframe_serialization, dataframe_warn_indexname
from .marks import CATEGORY10
from ._version import __frontend_version__


class MarketMap(DOMWidget):
Expand Down Expand Up @@ -212,6 +214,8 @@ def _handle_custom_msgs(self, _, content, buffers=None):
_model_name = Unicode('MarketMapModel').tag(sync=True)
_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)


class SquareMarketMap(MarketMap):
Expand Down
4 changes: 3 additions & 1 deletion bqplot/marks.py
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@

from .scales import Scale, OrdinalScale
from .traits import Date, array_serialization, array_squeeze, array_dimension_bounds

from ._version import __frontend_version__
from .colorschemes import CATEGORY10


Expand Down Expand Up @@ -162,6 +162,8 @@ class Mark(Widget):
_model_name = Unicode('MarkModel').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)
_ipython_display_ = None

def _get_dimension_scales(self, dimension, preserve_domain=False):
Expand Down
3 changes: 3 additions & 0 deletions bqplot/scales.py
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@

import numpy as np
from .traits import Date
from ._version import __frontend_version__


def register_scale(key=None):
Expand Down Expand Up @@ -92,6 +93,8 @@ class Scale(Widget):
_model_name = Unicode('ScaleModel').tag(sync=True)
_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)
_ipython_display_ = None # We cannot display a scale outside of a figure


Expand Down
3 changes: 3 additions & 0 deletions bqplot/toolbar.py
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@

from .interacts import PanZoom
from .figure import Figure
from ._version import __frontend_version__


@register('bqplot.toolbar')
Expand Down Expand Up @@ -75,3 +76,5 @@ class Toolbar(DOMWidget):
_model_name = Unicode('ToolbarModel').tag(sync=True)
_view_module = Unicode('bqplot').tag(sync=True)
_model_module = Unicode('bqplot').tag(sync=True)
_view_module_version = Unicode(__frontend_version__).tag(sync=True)
_model_module_version = Unicode(__frontend_version__).tag(sync=True)
3 changes: 3 additions & 0 deletions js/src/AxisModel.js
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ var widgets = require("jupyter-js-widgets");
var d3 = require("d3");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var AxisModel = basemodel.BaseModel.extend({

Expand All @@ -26,6 +27,8 @@ var AxisModel = basemodel.BaseModel.extend({
_view_name: "Axis",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

orientation: "horizontal",
side: null,
Expand Down
4 changes: 3 additions & 1 deletion js/src/BaseModel.js
View file
Open in desktop
Expand Up @@ -15,13 +15,15 @@

var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var semver_range = "^" + require("../package.json").version;

var BaseModel = widgets.WidgetModel.extend({

defaults: function() {
return _.extend(widgets.WidgetModel.prototype.defaults(), {
_model_name: "BaseModel",
_model_module: "bqplot"
_model_module: "bqplot",
_model_module_version: semver_range
});
},

Expand Down
3 changes: 3 additions & 0 deletions js/src/FigureModel.js
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ var widgets = require("jupyter-js-widgets");
var d3 = require("d3");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var FigureModel = basemodel.BaseModel.extend({

Expand All @@ -26,6 +27,8 @@ var FigureModel = basemodel.BaseModel.extend({
_view_name: "Figure",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

title: "",
axes: [],
Expand Down
4 changes: 4 additions & 0 deletions js/src/HandDrawModel.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var HandDrawModel = basemodel.BaseModel.extend({

Expand All @@ -25,6 +26,9 @@ var HandDrawModel = basemodel.BaseModel.extend({
_view_name: "HandDraw",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

lines: null,
line_index: 0,
min_x: null,
Expand Down
3 changes: 3 additions & 0 deletions js/src/MarkModel.js
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ var widgets = require("jupyter-js-widgets");
var d3 = require("d3");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var MarkModel = basemodel.BaseModel.extend({

Expand All @@ -25,6 +26,8 @@ var MarkModel = basemodel.BaseModel.extend({
_model_name: "MarkModel",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

scales: {},
scales_metadata: {},
Expand Down
3 changes: 3 additions & 0 deletions js/src/MarketMapModel.js
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var d3 = require("d3");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var MarketMapModel = basemodel.BaseModel.extend({

Expand All @@ -26,6 +27,8 @@ var MarketMapModel = basemodel.BaseModel.extend({
_view_name: "MarketMap",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

map_width: 1080,
map_height: 800,
Expand Down
3 changes: 3 additions & 0 deletions js/src/PanZoomModel.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var PanZoomModel = basemodel.BaseModel.extend({

Expand All @@ -25,6 +26,8 @@ var PanZoomModel = basemodel.BaseModel.extend({
_view_name: "PanZoom",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,
scales: {},
allow_pan: true,
allow_zoom: true
Expand Down
3 changes: 3 additions & 0 deletions js/src/ScaleModel.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
var d3 = require("d3");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var ScaleModel = basemodel.BaseModel.extend({

Expand All @@ -25,6 +26,8 @@ var ScaleModel = basemodel.BaseModel.extend({
_view_name: "Scale",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,
reverse: false,
allow_padding: true
});
Expand Down
3 changes: 3 additions & 0 deletions js/src/SelectorModel.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var basemodel = require("./BaseModel");
var semver_range = "^" + require("../package.json").version;

var SelectorModel = basemodel.BaseModel.extend({

Expand All @@ -24,6 +25,8 @@ var SelectorModel = basemodel.BaseModel.extend({
_model_name: "SelectorModel",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,
marks: []
});
}
Expand Down
3 changes: 3 additions & 0 deletions js/src/Toolbar.js
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@

var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var semver_range = "^" + require("../package.json").version;

var ToolbarModel = widgets.DOMWidgetModel.extend({

Expand All @@ -24,6 +25,8 @@ var ToolbarModel = widgets.DOMWidgetModel.extend({
_view_name: "Toolbar",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

figure: undefined,
_panning: false,
Expand Down
3 changes: 3 additions & 0 deletions js/src/TooltipModel.js
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@

var widgets = require("jupyter-js-widgets");
var _ = require("underscore");
var semver_range = "^" + require("../package.json").version;

var TooltipModel = widgets.DOMWidgetModel.extend({

Expand All @@ -24,6 +25,8 @@ var TooltipModel = widgets.DOMWidgetModel.extend({
_view_name: "Tooltip",
_model_module: "bqplot",
_view_module: "bqplot",
_model_module_version: semver_range,
_view_module_version: semver_range,

fields: [],
formats: [],
Expand Down