kevcunnane
diff --git a/‎.travis.yml‎
Lines changed: 2 additions & 0 deletions b/‎.travis.yml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 25 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎Dockerfile.jupyter‎
Lines changed: 5 additions & 1 deletion b/‎Dockerfile.jupyter‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎Dockerfile.spark‎
Lines changed: 31 additions & 16 deletions b/‎Dockerfile.spark‎
Lines changed: 31 additions & 16 deletions
diff --git a/‎README.md‎
Lines changed: 12 additions & 7 deletions b/‎README.md‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎RELEASING.md‎
Lines changed: 6 additions & 0 deletions b/‎RELEASING.md‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎autovizwidget/autovizwidget/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎autovizwidget/autovizwidget/__init__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎autovizwidget/autovizwidget/plotlygraphs/graphbase.py‎
Lines changed: 2 additions & 2 deletions b/‎autovizwidget/autovizwidget/plotlygraphs/graphbase.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎autovizwidget/autovizwidget/plotlygraphs/piegraph.py‎
Lines changed: 2 additions & 2 deletions b/‎autovizwidget/autovizwidget/plotlygraphs/piegraph.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎autovizwidget/requirements.txt‎
Lines changed: 3 additions & 3 deletions b/‎autovizwidget/requirements.txt‎
Lines changed: 3 additions & 3 deletions
@@ -1,7 +1,9 @@
+dist: xenial
 language: python
 python:
 - '2.7.13'
 - '3.6'
+- '3.7'
 install:
 - pip install six
 - pip install -r hdijupyterutils/requirements.txt -e hdijupyterutils
 
@@ -0,0 +1,25 @@
+# Changelog
+
+## 0.12.9
+
+### Features
+
+* Support server-side rendering of images, so you don't have to ship all the data to the client to do visualization—see the `%matplot` usage in the example notebook. Thanks to wangqiaoshi for the patch.
+* Progress bar for long running queries. Thanks to @juliusvonkohout.
+
+### Bug fixes
+
+* Work correctly with newer versions of the Jupyter notebook. Thanks to Jaipreet Singh for the patch, Eric Dill for testing, and G-Research for sponsoring Itamar Turner-Trauring's time.
+
+### Other changes
+
+* Switch to Plotly 3.
+
+## 0.12.8
+
+### Bug fixes:
+
+* Updated code to work with Livy 0.5 and later, where Python 3 support is not a different kind of session. Thanks to Gianmario Spacagna for contributing some of the code, and G-Research for sponsoring Itamar Turner-Trauring's time.
+* Fixed `AttributeError` on `None`, thanks to Eric Dill.
+* `recovering` session status won't cause a blow up anymore. Thanks to G-Research for sponsoring Itamar Turner-Trauring's time.
+
@@ -19,6 +19,11 @@ COPY examples /home/jovyan/work
 COPY hdijupyterutils hdijupyterutils/
 COPY autovizwidget autovizwidget/
 COPY sparkmagic sparkmagic/
+
+USER root
+RUN chown -R $NB_USER .
+
+USER $NB_USER
 RUN if [ "$dev_mode" = "true" ]; then \
       cd hdijupyterutils && pip install . && cd ../ && \
       cd autovizwidget && pip install . && cd ../ && \
@@ -31,7 +36,6 @@ RUN sed -i 's/localhost/spark/g' /home/$NB_USER/.sparkmagic/config.json
 RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
 RUN jupyter-kernelspec install --user $(pip show sparkmagic | grep Location | cut -d" " -f2)/sparkmagic/kernels/sparkkernel
 RUN jupyter-kernelspec install --user $(pip show sparkmagic | grep Location | cut -d" " -f2)/sparkmagic/kernels/pysparkkernel
-RUN jupyter-kernelspec install --user $(pip show sparkmagic | grep Location | cut -d" " -f2)/sparkmagic/kernels/pyspark3kernel
 RUN jupyter-kernelspec install --user $(pip show sparkmagic | grep Location | cut -d" " -f2)/sparkmagic/kernels/sparkrkernel
 RUN jupyter serverextension enable --py sparkmagic
 
 
@@ -1,37 +1,52 @@
-FROM gettyimages/spark:2.1.0-hadoop-2.7
+FROM debian:stretch
 
 RUN apt-get update && apt-get install -yq --no-install-recommends --force-yes \
+    curl \
     git \
-    openjdk-7-jdk \
+    openjdk-8-jdk \
     maven \
-    python2.7 \
-    python3.4 \
+    python2.7 python2.7-setuptools \
+    python3 python3-setuptools \
     r-base \
     r-base-core && \
     rm -rf /var/lib/apt/lists/*
 
+RUN easy_install3 pip py4j
 RUN pip install --upgrade setuptools
 
-ENV LIVY_BUILD_VERSION livy-server-0.3.0
-ENV LIVY_APP_PATH /apps/$LIVY_BUILD_VERSION
-ENV LIVY_BUILD_PATH /apps/build/livy
-ENV PYSPARK_PYTHON python2.7
-ENV PYSPARK3_PYTHON python3.4
+ENV PYTHONHASHSEED 0
+ENV PYTHONIOENCODING UTF-8
+ENV PIP_DISABLE_PIP_VERSION_CHECK 1
 
+ENV SPARK_BUILD_VERSION 2.3.3
+ENV SPARK_HOME /apps/spark-$SPARK_BUILD_VERSION
+ENV SPARK_BUILD_PATH /apps/build/spark
 RUN mkdir -p /apps/build && \
-    cd /apps/build && \
-	git clone https://github.com/cloudera/livy.git && \
+  cd /apps/build && \
+  git clone https://github.com/apache/spark.git spark && \
+  cd $SPARK_BUILD_PATH && \
+  git checkout v$SPARK_BUILD_VERSION && \
+  dev/make-distribution.sh --name spark-$SPARK_BUILD_VERSION -Phive -Phive-thriftserver -Pyarn && \
+  cp -r /apps/build/spark/dist $SPARK_HOME && \
+  rm -rf $SPARK_BUILD_PATH
+
+ENV LIVY_BUILD_VERSION 0.6.0-incubating
+ENV LIVY_APP_PATH /apps/apache-livy-$LIVY_BUILD_VERSION-bin
+ENV LIVY_BUILD_PATH /apps/build/livy
+RUN cd /apps/build && \
+	git clone https://github.com/apache/incubator-livy.git livy && \
 	cd $LIVY_BUILD_PATH && \
-  git checkout v0.3.0 && \
-    mvn -DskipTests -Dspark.version=$SPARK_VERSION clean package && \
+  git checkout v$LIVY_BUILD_VERSION-rc2 && \
+    mvn -DskipTests -Dspark.version=$SPARK_BUILD_VERSION clean package && \
     ls -al $LIVY_BUILD_PATH && ls -al $LIVY_BUILD_PATH/assembly && ls -al $LIVY_BUILD_PATH/assembly/target && \
-    unzip $LIVY_BUILD_PATH/assembly/target/$LIVY_BUILD_VERSION.zip -d /apps && \
+    unzip $LIVY_BUILD_PATH/assembly/target/apache-livy-${LIVY_BUILD_VERSION}-bin.zip -d /apps && \
     rm -rf $LIVY_BUILD_PATH && \
 	mkdir -p $LIVY_APP_PATH/upload && \
   mkdir -p $LIVY_APP_PATH/logs
 
+RUN pip install matplotlib
+RUN pip install pandas
 
 EXPOSE 8998
 
-CMD ["/apps/livy-server-0.3.0/bin/livy-server"]
-
+CMD $LIVY_APP_PATH/bin/livy-server
@@ -9,14 +9,16 @@ The Sparkmagic project includes a set of magics for interactively running Spark
 
 ![Automatic visualization](screenshots/autoviz.png)
 
+![Server-side visualization](screenshots/matplotlib.png)
+
 ![Help](screenshots/help.png)
 
 ## Features
 
 * Run Spark code in multiple languages against any remote Spark cluster through Livy
 * Automatic SparkContext (`sc`) and HiveContext (`sqlContext`) creation
 * Easily execute SparkSQL queries with the `%%sql` magic
-* Automatic visualization of SQL queries in the PySpark, PySpark3, Spark and SparkR kernels; use an easy visual interface to interactively construct visualizations, no code required
+* Automatic visualization of SQL queries in the PySpark, Spark and SparkR kernels; use an easy visual interface to interactively construct visualizations, no code required
 * Easy access to Spark application information and logs (`%%info` magic)
 * Ability to capture the output of SQL queries as Pandas dataframes to interact with other Python libraries (e.g. matplotlib)
 * Authenticate to Livy via Basic Access authentication or via Kerberos
@@ -43,20 +45,23 @@ See [Pyspark](examples/Pyspark%20Kernel.ipynb) and [Spark](examples/Spark%20Kern
 2. Make sure that ipywidgets is properly installed by running
 
         jupyter nbextension enable --py --sys-prefix widgetsnbextension 
-        
-3. (Optional) Install the wrapper kernels. Do `pip show sparkmagic` and it will show the path where `sparkmagic` is installed at. `cd` to that location and do:
+ 
+3. If you're using JupyterLab, you'll need to run another command:
+
+        jupyter labextension install @jupyter-widgets/jupyterlab-manager
+
+4. (Optional) Install the wrapper kernels. Do `pip show sparkmagic` and it will show the path where `sparkmagic` is installed at. `cd` to that location and do:
 
         jupyter-kernelspec install sparkmagic/kernels/sparkkernel
         jupyter-kernelspec install sparkmagic/kernels/pysparkkernel
-        jupyter-kernelspec install sparkmagic/kernels/pyspark3kernel
         jupyter-kernelspec install sparkmagic/kernels/sparkrkernel
         
-4. (Optional) Modify the configuration file at ~/.sparkmagic/config.json. Look at the [example_config.json](sparkmagic/example_config.json)
+5. (Optional) Modify the configuration file at ~/.sparkmagic/config.json. Look at the [example_config.json](sparkmagic/example_config.json)
 
-5. (Optional) Enable the server extension so that clusters can be programatically changed:
+6. (Optional) Enable the server extension so that clusters can be programatically changed:
 
         jupyter serverextension enable --py sparkmagic
-        
+
 ## Authentication Methods
 
 Sparkmagic supports:
 
@@ -0,0 +1,6 @@
+# How to release
+
+1. Update versions in all three `__init__.py` files.
+2. Merge `master` into `release`.
+3. Tag on `release`.
+
@@ -1 +1 @@
-__version__ = '0.12.6'
+__version__ = '0.12.9'
@@ -1,7 +1,7 @@
 # Copyright (c) 2015  [email protected]
 # Distributed under the terms of the Modified BSD License.
 
-from plotly.graph_objs import Figure, Data, Layout
+from plotly.graph_objs import Figure, Layout
 from plotly.offline import iplot
 try:
     from pandas.core.base import DataError
@@ -34,7 +34,7 @@ def render(self, df, encoding, output):
 
         with output:
             try:
-                fig = Figure(data=Data(data), layout=layout)
+                fig = Figure(data=data, layout=layout)
                 iplot(fig, show_link=False)
             except TypeError:
                 print("\n\n\nPlease select another set of X and Y axis, because the type of the current axis do\n"
 
@@ -1,7 +1,7 @@
 # Copyright (c) 2015  [email protected]
 # Distributed under the terms of the Modified BSD License.
 
-from plotly.graph_objs import Pie, Figure, Data
+from plotly.graph_objs import Pie, Figure
 from plotly.offline import iplot
 try:
     from pandas.core.base import DataError
@@ -48,7 +48,7 @@ def render(df, encoding, output):
             else:
                 data = [Pie(values=values, labels=labels)]
 
-                fig = Figure(data=Data(data))
+                fig = Figure(data=data)
                 iplot(fig, show_link=False)
 
     @staticmethod
 
@@ -1,5 +1,5 @@
-plotly>=1.10.0,<3.0
-ipywidgets>5.0.0,<8.0
+plotly>=3
+ipywidgets>5.0.0
 hdijupyterutils>=0.6
-notebook>=4.2,<6.0
+notebook>=4.2
 pandas>=0.20.1
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '0.12.6'`
	`1`	`+__version__ = '0.12.9'`