From ba8331b206ac606689a64e81422863da974298ca Mon Sep 17 00:00:00 2001 From: Robert Bidas Date: Fri, 12 Jan 2018 14:53:17 +0100 Subject: [PATCH] #6644 python output containers broken (#6653) --- beakerx/beakerx/beakerx_widgets.py | 5 +++++ beakerx/beakerx/output_container/outputcontainer.py | 2 +- doc/python/OutputContainers.ipynb | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/beakerx/beakerx/beakerx_widgets.py b/beakerx/beakerx/beakerx_widgets.py index 579b916b08..0248feeafb 100644 --- a/beakerx/beakerx/beakerx_widgets.py +++ b/beakerx/beakerx/beakerx_widgets.py @@ -168,6 +168,8 @@ def __init__(self, **kwargs): _view_name = Unicode('HTMLPreView').tag(sync=True) _model_name = Unicode('HTMLPreModel').tag(sync=True) + _view_module = Unicode('beakerx').tag(sync=True) + _model_module = Unicode('beakerx').tag(sync=True) _model_module_version = Unicode('*').tag(sync=True) _view_module_version = Unicode('*').tag(sync=True) @@ -284,6 +286,9 @@ def __init__(self, **kwargs): class CyclingDisplayBox(BeakerxBox): _view_name = Unicode('CyclingDisplayBoxView').tag(sync=True) _model_name = Unicode('CyclingDisplayBoxModel').tag(sync=True) + _view_module = Unicode('beakerx').tag(sync=True) + _model_module = Unicode('beakerx').tag(sync=True) + period = Int(5000).tag(sync=True) def __init__(self, children): diff --git a/beakerx/beakerx/output_container/outputcontainer.py b/beakerx/beakerx/output_container/outputcontainer.py index 09ed3d099e..60819852eb 100644 --- a/beakerx/beakerx/output_container/outputcontainer.py +++ b/beakerx/beakerx/output_container/outputcontainer.py @@ -41,7 +41,7 @@ def getWidgets(self, container): def toWidget(self, item): if item is None: - return self.createHTML("None") + return self.createHTMLPre("None") if isinstance(item, DataFrame): return TableDisplay(item) diff --git a/doc/python/OutputContainers.ipynb b/doc/python/OutputContainers.ipynb index 015ae22066..bcc5cd8798 100644 --- a/doc/python/OutputContainers.ipynb +++ b/doc/python/OutputContainers.ipynb @@ -38,7 +38,7 @@ "metadata": {}, "outputs": [], "source": [ - "rates = pd.read_csv('resources/data/interest-rates.csv')\n", + "rates = pd.read_csv('../resources/data/interest-rates.csv')\n", "c = Color(120, 120, 120, 100)\n", "plot1 = Plot(initWidth= 300, initHeight= 400) \n", "plot1.add(Points(x= rates.y1, y=rates.y30, size= 3, displayName=\"y1 vs y30\"))\n", @@ -146,7 +146,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.4" + "version": "3.6.4" } }, "nbformat": 4,