Revert "Merge pull request plotly#220 from plotly/manifest-file"

This reverts commit a97c888, reversing
changes made to a5f5067.

Author: theengineear

MANIFEST.in

@@ -1,14 +1,8 @@
 from __future__ import absolute_import
+from plotly import utils
 import textwrap
 import os
 import sys
-
-from plotly import utils
-from plotly.resources import (GRAPH_REFERENCE_GRAPH_OBJS_META,
-                              GRAPH_REFERENCE_NAME_TO_KEY,
-                              GRAPH_REFERENCE_KEY_TO_NAME,
-                              GRAPH_REFERENCE_OBJ_MAP, GRAPH_REFERENCE_DIR)
-
 if sys.version[:3] == '2.6':
     try:
         from ordereddict import OrderedDict
@@ -25,27 +19,23 @@
     import json
 import six
 
+from pkg_resources import resource_string
 
-def _load_graph_ref():
-    """
-    A private method to load the graph reference json files.
-
-    :return: (tuple) A tuple of dict objects.
-
-    """
-    out = []
 
-    # this splits directory path from basenames
-    filenames = [
-        os.path.split(GRAPH_REFERENCE_GRAPH_OBJS_META)[-1],
-        os.path.split(GRAPH_REFERENCE_OBJ_MAP)[-1],
-        os.path.split(GRAPH_REFERENCE_NAME_TO_KEY)[-1],
-        os.path.split(GRAPH_REFERENCE_KEY_TO_NAME)[-1]
+# Define graph reference loader
+def _load_graph_ref():
+    graph_reference_dir = 'graph_reference'
+    json_files = [
+        'graph_objs_meta.json',
+        'OBJ_MAP.json',
+        'NAME_TO_KEY.json',
+        'KEY_TO_NAME.json'
     ]
-    for filename in filenames:
-        path = os.path.join(sys.prefix, GRAPH_REFERENCE_DIR, filename)
-        with open(path, 'r') as f:
-            tmp = json.load(f, object_pairs_hook=OrderedDict)
+    out = []
+    for json_file in json_files:
+        relative_path = os.path.join(graph_reference_dir, json_file)
+        s = resource_string('plotly', relative_path).decode('utf-8')
+        tmp = json.loads(s, object_pairs_hook=OrderedDict)
         tmp = utils.decode_unicode(tmp)
         out += [tmp]
     return tuple(out)

plotly/graph_objs/graph_objs_tools.py

@@ -1 +1 @@
-__version__ = '1.6.18'
+__version__ = '1.6.17'

plotly/resources.py

@@ -1,7 +1,6 @@
-import os
-import sys
-import uuid
 from collections import deque
+import uuid
+import sys
 
 # TODO: protected imports?
 from IPython.html import widgets
@@ -11,7 +10,7 @@
 import plotly.plotly.plotly as py
 from plotly import utils, tools
 from plotly.graph_objs import Figure
-from plotly.resources import WIDGETS_DIR, WIDGETS_MAIN_JS
+from pkg_resources import resource_string
 
 # even though python 2.6 wouldn't be able to run *any* of this...
 if sys.version[:3] == '2.6':
@@ -22,10 +21,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
-js_file_path = os.path.join(sys.prefix, WIDGETS_DIR,
-                            os.path.split(WIDGETS_MAIN_JS)[-1])
-with open(js_file_path, 'r') as f:
-    js_widget_code = f.read()
+js_widget_code = resource_string('plotly',
+                                 'widgets/graphWidget.js').decode('utf-8')
 
 display(Javascript(js_widget_code))
 

plotly/version.py

@@ -1,13 +1,13 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 
 exec (open('plotly/version.py').read())
-exec (open('plotly/resources.py').read())
 
 
 def readme():
     with open('README.rst') as f:
         return f.read()
 
+
 setup(name='plotly',
       version=__version__,
       use_2to3=False,
@@ -31,9 +31,16 @@ def readme():
           'Topic :: Scientific/Engineering :: Visualization',
       ],
       license='MIT',
-      packages=find_packages(),
-      data_files=[(GRAPH_REFERENCE_DIR, GRAPH_REFERENCE_FILES),
-                  (WIDGETS_DIR, WIDGETS_FILES)],
+      packages=['plotly',
+                'plotly/plotly',
+                'plotly/plotly/chunked_requests',
+                'plotly/graph_objs',
+                'plotly/grid_objs',
+                'plotly/widgets',
+                'plotly/matplotlylib',
+                'plotly/matplotlylib/mplexporter',
+                'plotly/matplotlylib/mplexporter/renderers'],
+      package_data={'plotly': ['graph_reference/*.json', 'widgets/*.js']},
       install_requires=['requests[security]', 'six', 'pytz'],
       extras_require={"PY2.6": ['simplejson', 'ordereddict',
                                 'requests[security]']},