Merge branch 'master' into release

Author: devstein

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## NEXT RELEASE
 
+## 0.19.0
+
+### Features
+
+* Added one internal magic to enable retry of session creation. Thanks @edwardps
+* New `%%pretty` magic for pretty printing a dataframe as an HTML table. Thanks @hegary 
+* Update Endpoint widget to shield passwords when entering them in the ipywidget. Thanks @J0rg3M3nd3z @jodom961
+
 ## 0.18.0
 
 ### Updates

autovizwidget/autovizwidget/__init__.py

@@ -1 +1 @@
-__version__ = '0.18.0'
+__version__ = '0.19.0'

autovizwidget/autovizwidget/tests/test_autovizwidget.py

@@ -1,7 +1,7 @@
 from mock import MagicMock, call
 from nose.tools import with_setup, assert_equals
 import pandas as pd
-from pandas.util.testing import assert_frame_equal, assert_series_equal
+from pandas.testing import assert_frame_equal, assert_series_equal
 
 from ..widget.autovizwidget import AutoVizWidget
 from ..widget.encoding import Encoding

examples/Magics in IPython Kernel.ipynb

@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## This notebook will demonstrate how we can use the spark magic to interspere our Python code with code that is running against a Spark cluster"
+    "## This notebook will demonstrate how we can use the spark magic to intersperse our Python code with code that is running against a Spark cluster"
    ]
   },
   {

examples/Pyspark Kernel.ipynb

@@ -681,7 +681,53 @@
     "Use '`%%cleanup -f`' magic to delete all of the sessions for this cluster, including this notebook's session.\n",
     "The force flag `-f` is mandatory."
    ]
-  }
+  },
+  {
+    "cell_type": "markdown",
+    "metadata": {},
+    "source": [
+     "### Pretty Print Spark Dataframes (%%pretty)\n",
+     "\n",
+     "Use '`%%pretty`' magic to display a Spark dataframe as a HTML formatted table"
+    ]
+   },
+  {
+    "cell_type": "code",
+    "execution_count": 3,
+    "metadata": {},
+    "outputs": [
+     {
+      "data": {
+       "application/vnd.jupyter.widget-view+json": {
+        "model_id": "",
+        "version_major": 2,
+        "version_minor": 0
+       },
+       "text/plain": [
+       ]
+      },
+      "metadata": {},
+      "output_type": "display_data"
+     },
+     {
+      "data": {
+       "text/html": [
+        "<table><tr><th>age</th><th>name</th></tr><tr><td>null</td><td>Michael</td></tr><tr><td>30</td><td>Andy</td></tr><tr><td>19</td><td>Justin</td></tr></table><br /><pre></pre>"
+       ],
+       "text/plain": [
+        "<IPython.core.display.HTML object>"
+       ]
+      },
+      "metadata": {},
+      "output_type": "display_data"
+     }
+    ],
+    "source": [
+     "%%pretty\n",
+     "df = spark.read.json(\"/apps/spark-2.3.3/examples/src/main/resources/people.json\")\n",
+     "df.show()"
+    ]
+   }
  ],
  "metadata": {
   "kernelspec": {

examples/Spark Kernel.ipynb

@@ -527,6 +527,59 @@
     "Use '`%%cleanup -f`' magic to delete all of the sessions for this cluster, including this notebook's session.\n",
     "The force flag `-f` is mandatory."
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Pretty Print Spark Dataframes (%%pretty)\n",
+    "\n",
+    "Use '`%%pretty`' magic to display a Scala Spark dataframe as a HTML formatted table"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "FloatProgress(value=0.0, bar_style='info', description='Progress:', layout=Layout(height='25px', width='50%'),…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/html": [
+       "<table><tr><th>col1</th><th>col2</th><th>col3</th></tr><tr><td>28</td><td>44</td><td>36</td></tr><tr><td>16</td><td>41</td><td>72</td></tr><tr><td>27</td><td>14</td><td>45</td></tr></table><br /><pre></pre>"
+      ],
+      "text/plain": [
+       "<IPython.core.display.HTML object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "%%pretty\n",
+    "df.show()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

hdijupyterutils/hdijupyterutils/__init__.py

@@ -1 +1 @@
-__version__ = '0.18.0'
+__version__ = '0.19.0'

hdijupyterutils/hdijupyterutils/ipywidgetfactory.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015  [email protected]
 # Distributed under the terms of the Modified BSD License.
 
-from ipywidgets import VBox, Output, Button, HTML, HBox, Dropdown, Checkbox, ToggleButtons, Text, Textarea, Tab
+from ipywidgets import VBox, Output, Button, HTML, HBox, Dropdown, Checkbox, ToggleButtons, Text, Textarea, Tab, Password
 
 
 class IpyWidgetFactory(object):
@@ -43,6 +43,10 @@ def get_toggle_buttons(**kwargs):
     def get_text(**kwargs):
         return Text(**kwargs)
 
+    @staticmethod
+    def get_password(**kwargs):
+        return Password(**kwargs)
+
     @staticmethod
     def get_text_area(**kwargs):
         return Textarea(**kwargs)

sparkmagic/sparkmagic/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.18.0'
+__version__ = '0.19.0'
 
 from sparkmagic.serverextension.handlers import load_jupyter_server_extension
 

sparkmagic/sparkmagic/auth/basic.py

@@ -18,7 +18,7 @@ def __init__(self, parsed_attributes=None):
             is created from parsing %spark magic command.
         """
         if parsed_attributes is not None:
-            if parsed_attributes.user is '' or parsed_attributes.password is '':
+            if parsed_attributes.user == '' or parsed_attributes.password == '':
                 new_exc = BadUserDataException("Need to supply username and password arguments for "\
                     "Basic Access Authentication. (e.g. -a username -p password).")
                 raise new_exc
@@ -47,7 +47,7 @@ def get_widgets(self, widget_width):
             width=widget_width
         )
 
-        self.password_widget = ipywidget_factory.get_text(
+        self.password_widget = ipywidget_factory.get_password(
             description='Password:',
             value=self.password,
             width=widget_width