V4 alpha 2 release (plotly#1620)

jonmmease · web-flow · commit 17cf071147e9 · 2019-06-15T13:56:25.000-04:00
* package metadata updates
* conda recipe updates
* package-lock update
* Add plotly express datasets as package data
* chart_studio -&gt; chart-studio in error message
* auto-import tools below chart_studio
diff --git a/packages/python/chart-studio/chart_studio/__init__.py b/packages/python/chart-studio/chart_studio/__init__.py
@@ -1,2 +1,8 @@
 from __future__ import absolute_import
-from chart_studio import (plotly, dashboard_objs, grid_objs, session)
+from chart_studio import (
+    plotly,
+    dashboard_objs,
+    grid_objs,
+    session,
+    tools,
+)
diff --git a/packages/python/plotly/_plotly_future_/__init__.py b/packages/python/plotly/_plotly_future_/__init__.py
@@ -41,7 +41,7 @@ def _chart_studio_warning(submodule):
 def _chart_studio_error(submodule):
     raise ImportError("""
 The plotly.{submodule} module is deprecated,
-please install the chart_studio package and use the
+please install the chart-studio package and use the
 chart_studio.{submodule} module instead. 
 """.format(submodule=submodule))
 
diff --git a/packages/python/plotly/plotly/data/__init__.py b/packages/python/plotly/plotly/data/__init__.py
@@ -75,4 +75,10 @@ def _get_dataset(d):
     import pandas
     import os
 
-    return pandas.read_csv(os.path.join(os.path.dirname(__file__), d + ".csv.gz"))
+    return pandas.read_csv(
+        os.path.join(
+            os.path.dirname(os.path.dirname(__file__)),
+            'package_data',
+            'datasets',
+            d + ".csv.gz")
+    )
diff --git a/packages/python/plotly/setup.py b/packages/python/plotly/setup.py
@@ -437,7 +437,9 @@ def run(self):
                 '_plotly_utils',
                 '_plotly_future_',
                 ] + graph_objs_packages + validator_packages,
-      package_data={'plotly': ['package_data/*', 'package_data/templates/*'],
+      package_data={'plotly': ['package_data/*',
+                               'package_data/templates/*',
+                               'package_data/datasets/*'],
                     'plotlywidget': ['static/extension.js',
                                      'static/index.js']},
       data_files=[
