From f03624603f39b828be38df93e06fdbfa957e740c Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Thu, 22 Jan 2015 18:22:12 -0500 Subject: [PATCH 1/6] =?UTF-8?q?no=20s=E2=80=A6=20ugg.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plotly/widgets/graph_widget.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plotly/widgets/graph_widget.py b/plotly/widgets/graph_widget.py index 8953924fcf0..1f7666138ac 100644 --- a/plotly/widgets/graph_widget.py +++ b/plotly/widgets/graph_widget.py @@ -14,10 +14,8 @@ # Load JS widget code # No officially recommended way to do this in any other way # http://mail.scipy.org/pipermail/ipython-dev/2014-April/013835.html -directory = os.path.dirname(os.path.realpath(__file__)) -js_widget_file = os.path.join(directory, 'graphWidget.js') js_widget_code = resource_string('plotly', - 'widgets/graphWidgets.js').decode('utf-8') + 'widgets/graphWidget.js').decode('utf-8') display(Javascript(js_widget_code)) From 9c63d78dedf5be2b19c14e655d96eb42a69c2b8d Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Thu, 22 Jan 2015 18:22:19 -0500 Subject: [PATCH 2/6] version bump --- plotly/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plotly/version.py b/plotly/version.py index 4574cc8974f..d07785c52ef 100644 --- a/plotly/version.py +++ b/plotly/version.py @@ -1 +1 @@ -__version__ = '1.6.3' +__version__ = '1.6.4' From 1ff746405845e441670ad0e26014ec157f285dc2 Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Fri, 23 Jan 2015 10:19:21 -0500 Subject: [PATCH 3/6] Simple import test for widgets. --- plotly/tests/test_optional/test_ipython/test_widgets.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 plotly/tests/test_optional/test_ipython/test_widgets.py diff --git a/plotly/tests/test_optional/test_ipython/test_widgets.py b/plotly/tests/test_optional/test_ipython/test_widgets.py new file mode 100644 index 00000000000..6d54403065b --- /dev/null +++ b/plotly/tests/test_optional/test_ipython/test_widgets.py @@ -0,0 +1,9 @@ +from unittest import TestCase + +from plotly.widgets import GraphWidget + + +class TestWidgets(TestCase): + + def test_instantiate_graph_widget(self): + widget = GraphWidget From fd3a906da01fb61961153b6bc870cf691f57eb58 Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Fri, 23 Jan 2015 10:24:37 -0500 Subject: [PATCH 4/6] revert version to 1.6.0, but stable this time. --- plotly/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plotly/version.py b/plotly/version.py index d07785c52ef..bcd8d54efbd 100644 --- a/plotly/version.py +++ b/plotly/version.py @@ -1 +1 @@ -__version__ = '1.6.4' +__version__ = '1.6.0' From 0595796e375ba7d40070f42c5997300730b20f34 Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Fri, 23 Jan 2015 10:45:24 -0500 Subject: [PATCH 5/6] Revert "revert version to 1.6.0, but stable this time." This reverts commit fd3a906da01fb61961153b6bc870cf691f57eb58. --- plotly/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plotly/version.py b/plotly/version.py index bcd8d54efbd..d07785c52ef 100644 --- a/plotly/version.py +++ b/plotly/version.py @@ -1 +1 @@ -__version__ = '1.6.0' +__version__ = '1.6.4' From cc9333d6d11eca1070264838d80572ad37660cf0 Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Fri, 23 Jan 2015 10:45:42 -0500 Subject: [PATCH 6/6] version bump --> 1.6.5 (test for widget import) --- plotly/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plotly/version.py b/plotly/version.py index d07785c52ef..f3df7f04b75 100644 --- a/plotly/version.py +++ b/plotly/version.py @@ -1 +1 @@ -__version__ = '1.6.4' +__version__ = '1.6.5'