More improvements to deployment.

jdavidheiser · Oct 5, 2014 · a062304 · a062304
1 parent 249d25a
commit a062304
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 456 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.md
 include LICENSE
 
-recursive-include qgrid/assets *.*
+recursive-include qgridjs *.*
diff --git a/qgrid/qgrid.py → qgrid.py b/qgrid/qgrid.py → qgrid.py
@@ -3,6 +3,8 @@
 from textwrap import dedent
 import uuid
 import json
+import pkgutil
+import IPython.html.nbextensions as nb_ext
 
 from IPython.display import display_html, display_javascript
 
@@ -77,10 +79,10 @@
     """
 )
 
-class QuantopianGrid(object):
-    def __init__(self, data_frame, remote):
+class qgrid(object):
+    remote_mode = True
+    def __init__(self, data_frame):
         self.data_frame = data_frame
-        self.remote = remote
         self.div_id = str(uuid.uuid4())
 
         self.df_copy = data_frame.copy()
@@ -113,10 +115,10 @@ def _ipython_display_(self):
             column_types_json = json.dumps(self.column_types)
             data_frame_json = self.df_copy.to_json(orient='records', date_format='iso', double_precision=self.precision)
 
-            if self.remote:
-                cdn_base_url = "https://rawgit.com/quantopian/SlickDataFrame/master/nbextensions"
+            if qgrid.remote_mode:
+                cdn_base_url = "https://rawgit.com/quantopian/qgrid/master/nbextensions/qgridjs"
             else:
-                cdn_base_url = "/nbextensions"
+                cdn_base_url = "/nbextensions/qgridjs"
 
             raw_html = SLICK_GRID_CSS.format(div_id=self.div_id, cdn_base_url=cdn_base_url)
             raw_js = SLICK_GRID_JS.format(cdn_base_url=cdn_base_url,
@@ -129,14 +131,23 @@ def _ipython_display_(self):
         except Exception, err:
             display_html('ERROR: {}'.format(str(err)), raw=True)
 
-def qgrid(dataframe, remote=True):
-    return QuantopianGrid(dataframe, remote)
+def set_remote_mode(remote_mode=True):
+    qgrid.remote_mode = remote_mode
 
 def load_ipython_extension(ipython):
     """
     Entrypoint for ipython.  Add objects to the user's namespace by adding them
     to the dictionary passed to ipython.push.
     """
+
+    js_pkg = pkgutil.get_loader("qgridjs")
+    if js_pkg != None:
+        qgridjs_path = js_pkg.filename
+        nb_ext.install_nbextension(qgridjs_path, overwrite=True, symlink=False, verbose=0)
+        set_remote_mode(False)
+    else:
+        set_remote_mode(True)
+
     ipython.push(
         {
             'qgrid': qgrid

diff --git a/qgrid_demo.ipynb b/qgrid_demo.ipynb
diff --git a/qgrid/__init__.py → qgridjs/__init__.py b/qgrid/__init__.py → qgridjs/__init__.py
diff --git a/qgrid/assets/lib/collapse.gif → qgridjs/lib/collapse.gif b/qgrid/assets/lib/collapse.gif → qgridjs/lib/collapse.gif
diff --git a/qgrid/assets/lib/expand.gif → qgridjs/lib/expand.gif b/qgrid/assets/lib/expand.gif → qgridjs/lib/expand.gif
diff --git a/qgrid/assets/lib/jquery.event.drag-2.2.js → qgridjs/lib/jquery.event.drag-2.2.js b/qgrid/assets/lib/jquery.event.drag-2.2.js → qgridjs/lib/jquery.event.drag-2.2.js
diff --git a/qgrid/assets/lib/slick-default-theme.css → qgridjs/lib/slick-default-theme.css b/qgrid/assets/lib/slick-default-theme.css → qgridjs/lib/slick-default-theme.css
diff --git a/qgrid/assets/lib/slick.autotooltips.js → qgridjs/lib/slick.autotooltips.js b/qgrid/assets/lib/slick.autotooltips.js → qgridjs/lib/slick.autotooltips.js
diff --git a/.../assets/lib/slick.checkboxselectcolumn.js → qgridjs/lib/slick.checkboxselectcolumn.js b/.../assets/lib/slick.checkboxselectcolumn.js → qgridjs/lib/slick.checkboxselectcolumn.js
diff --git a/qgrid/assets/lib/slick.core.2.2.js → qgridjs/lib/slick.core.2.2.js b/qgrid/assets/lib/slick.core.2.2.js → qgridjs/lib/slick.core.2.2.js
diff --git a/qgrid/assets/lib/slick.dataview.2.2.js → qgridjs/lib/slick.dataview.2.2.js b/qgrid/assets/lib/slick.dataview.2.2.js → qgridjs/lib/slick.dataview.2.2.js
diff --git a/qgrid/assets/lib/slick.grid.2.2.js → qgridjs/lib/slick.grid.2.2.js b/qgrid/assets/lib/slick.grid.2.2.js → qgridjs/lib/slick.grid.2.2.js
diff --git a/qgrid/assets/lib/slick.grid.css → qgridjs/lib/slick.grid.css b/qgrid/assets/lib/slick.grid.css → qgridjs/lib/slick.grid.css
diff --git a/qgrid/assets/lib/slick.rowselectionmodel.js → qgridjs/lib/slick.rowselectionmodel.js b/qgrid/assets/lib/slick.rowselectionmodel.js → qgridjs/lib/slick.rowselectionmodel.js
diff --git a/qgrid/assets/lib/sort_asc.png → qgridjs/lib/sort_asc.png b/qgrid/assets/lib/sort_asc.png → qgridjs/lib/sort_asc.png
diff --git a/qgrid/assets/lib/sort_desc.png → qgridjs/lib/sort_desc.png b/qgrid/assets/lib/sort_desc.png → qgridjs/lib/sort_desc.png
diff --git a/qgrid/assets/qgrid.css → qgridjs/qgrid.css b/qgrid/assets/qgrid.css → qgridjs/qgrid.css
diff --git a/qgrid/assets/qgrid.datefilter.js → qgridjs/qgrid.datefilter.js b/qgrid/assets/qgrid.datefilter.js → qgridjs/qgrid.datefilter.js
diff --git a/qgrid/assets/qgrid.filterbase.js → qgridjs/qgrid.filterbase.js b/qgrid/assets/qgrid.filterbase.js → qgridjs/qgrid.filterbase.js
diff --git a/qgrid/assets/qgrid.js → qgridjs/qgrid.js b/qgrid/assets/qgrid.js → qgridjs/qgrid.js
diff --git a/qgrid/assets/qgrid.securityfilter.js → qgridjs/qgrid.securityfilter.js b/qgrid/assets/qgrid.securityfilter.js → qgridjs/qgrid.securityfilter.js
diff --git a/qgrid/assets/qgrid.sliderfilter.js → qgridjs/qgrid.sliderfilter.js b/qgrid/assets/qgrid.sliderfilter.js → qgridjs/qgrid.sliderfilter.js
diff --git a/qgrid/assets/qgrid.textfilter.js → qgridjs/qgrid.textfilter.js b/qgrid/assets/qgrid.textfilter.js → qgridjs/qgrid.textfilter.js
diff --git a/setup.py b/setup.py
@@ -22,7 +22,8 @@
     description='An extension for viewing pandas DataFrames in IPython notebook.',
     author='Quantopian Inc.',
     author_email='[email protected]',
-    packages=find_packages(),
+    packages=['qgridjs'],
+    py_modules = ['qgrid'],
     license='Apache 2.0',
     include_package_data=True,
     zip_safe=False,