upgrade to PivotTable.js 2.13.0

nicolaskruchten · May 7, 2017 · e86f43e · e86f43e
1 parent 50d8e7e
commit e86f43e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/README.rst b/README.rst
@@ -22,4 +22,4 @@ Usage
     pivot_ui(df)
 
 .. _Jupyter/IPython Notebook: http://jupyter.org/
-.. _PivotTable.js: https://github.com/nicolaskruchten/pivottable
+.. _PivotTable.js: https://github.com/nicolaskruchten/pivottable
diff --git a/pivottablejs/__init__.py b/pivottablejs/__init__.py
@@ -1,27 +1,23 @@
-# %install_ext http://nicolas.kruchten.com/pivottable/jupyter/pivottablejs.py
-# %load_ext pivottablejs
-# %pivottablejs data_frame
-
-
 template = """
 <!DOCTYPE html>
 <html>
     <head>
         <title>PivotTable.js</title>
-        
+
         <!-- external libs from cdnjs -->
-        <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.10/c3.min.css">
+        <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.11/c3.min.css">
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.11/c3.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-csv/0.71/jquery.csv-0.71.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.10/c3.min.js"></script>
 
-        <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/pivottable/1.6.3/pivot.min.css">
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/1.6.3/pivot.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/1.6.3/d3_renderers.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/1.6.3/c3_renderers.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/1.6.3/export_renderers.min.js"></script>
+
+        <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/pivottable/2.13.0/pivot.min.css">
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/2.13.0/pivot.min.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/2.13.0/d3_renderers.min.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/2.13.0/c3_renderers.min.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pivottable/2.13.0/export_renderers.min.js"></script>
 
         <style>
             body {font-family: Verdana;}
@@ -39,6 +35,7 @@
             .tick line {stroke: white;}
             .c3-axis path {stroke: grey;}
             .c3-circle { opacity: 1 !important; }
+            .c3-xgrid-focus {visibility: hidden !important;}
         </style>
     </head>
     <body>
@@ -47,13 +44,13 @@
                 if(window.location != window.parent.location)
                     $("<a>", {target:"_blank", href:""})
                         .text("[pop out]").prependTo($("body"));
-                    
-                $("#output").pivotUI( 
-                    $.csv.toArrays($("#output").text()), 
-                    { 
+
+                $("#output").pivotUI(
+                    $.csv.toArrays($("#output").text()),
+                    {
                         renderers: $.extend(
-                            $.pivotUtilities.renderers, 
-                            $.pivotUtilities.c3_renderers, 
+                            $.pivotUtilities.renderers,
+                            $.pivotUtilities.c3_renderers,
                             $.pivotUtilities.d3_renderers,
                             $.pivotUtilities.export_renderers
                             ),
@@ -73,4 +70,4 @@ def pivot_ui(df, outfile_path = "pivottablejs.html", width="100%", height="500")
     with open(outfile_path, 'w') as outfile:
         outfile.write(template % df.to_csv())
     return IFrame(src=outfile_path, width=width, height=height)
-        
+
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.1.0',
+    version='0.2.0',
 
     description='PivotTable.js integration for Jupyter/IPython Notebook',
     long_description=long_description,
@@ -72,4 +72,4 @@
     # simple. Or you can use find_packages().
     packages=["pivottablejs"]
 
-)
+)