From 39104f2432082ed19152d9b34a325493b8701415 Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Tue, 26 Apr 2016 08:55:18 -0400 Subject: [PATCH 1/2] Upgrade to notebook 4.2, ipywidgets 5.0 --- all-spark-notebook/README.md | 2 +- datascience-notebook/README.md | 2 +- minimal-notebook/Dockerfile | 2 +- minimal-notebook/README.md | 2 +- pyspark-notebook/Dockerfile | 10 ++++++---- pyspark-notebook/README.md | 2 +- r-notebook/README.md | 2 +- scipy-notebook/Dockerfile | 8 +++++--- scipy-notebook/README.md | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/all-spark-notebook/README.md b/all-spark-notebook/README.md index ef7e030e..7e4b3bc4 100644 --- a/all-spark-notebook/README.md +++ b/all-spark-notebook/README.md @@ -4,7 +4,7 @@ ## What it Gives You -* Jupyter Notebook 4.1.x +* Jupyter Notebook 4.2.x * Conda Python 3.x and Python 2.7.x environments * Conda R 3.2.x environment * Scala 2.10.x diff --git a/datascience-notebook/README.md b/datascience-notebook/README.md index 717e5735..09a5c741 100644 --- a/datascience-notebook/README.md +++ b/datascience-notebook/README.md @@ -4,7 +4,7 @@ ## What it Gives You -* Jupyter Notebook 4.1.x +* Jupyter Notebook 4.2.x * Conda Python 3.x and Python 2.7.x environments * pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh pre-installed * Conda R v3.2.x and channel diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile index 16ee4555..ed1a3987 100644 --- a/minimal-notebook/Dockerfile +++ b/minimal-notebook/Dockerfile @@ -78,7 +78,7 @@ RUN cd /tmp && \ # Install Jupyter notebook as jovyan RUN conda install --quiet --yes \ - 'notebook=4.1*' \ + 'notebook=4.2*' \ terminado \ && conda clean -tipsy diff --git a/minimal-notebook/README.md b/minimal-notebook/README.md index bf350228..1fbf7140 100644 --- a/minimal-notebook/README.md +++ b/minimal-notebook/README.md @@ -4,7 +4,7 @@ ## What it Gives You -* Jupyter Notebook 4.1.x +* Jupyter Notebook 4.2.x * Conda Python 3.x * No preinstalled scientific computing packages * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 52146f49..395b147c 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -46,7 +46,7 @@ USER jovyan # Install Python 3 packages RUN conda install --quiet --yes \ - 'ipywidgets=4.1*' \ + 'ipywidgets=5.0*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ @@ -54,11 +54,13 @@ RUN conda install --quiet --yes \ 'seaborn=0.7*' \ 'scikit-learn=0.17*' \ && conda clean -tipsy - +# Activate ipywidgets extension in the environment that runs the notebook server +RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix + # Install Python 2 packages and kernel spec RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ - 'ipython=4.1*' \ - 'ipywidgets=4.1*' \ + 'ipython=4.2*' \ + 'ipywidgets=5.0*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ diff --git a/pyspark-notebook/README.md b/pyspark-notebook/README.md index 6985a38d..09190d82 100644 --- a/pyspark-notebook/README.md +++ b/pyspark-notebook/README.md @@ -4,7 +4,7 @@ ## What it Gives You -* Jupyter Notebook 4.1.x +* Jupyter Notebook 4.2.x * Conda Python 3.x and Python 2.7.x environments * pyspark, pandas, matplotlib, scipy, seaborn, scikit-learn pre-installed * Spark 1.6.0 for use in local mode or to connect to a cluster of Spark workers diff --git a/r-notebook/README.md b/r-notebook/README.md index eaaf8278..1ac6487d 100644 --- a/r-notebook/README.md +++ b/r-notebook/README.md @@ -4,7 +4,7 @@ ## What it Gives You -* Jupyter Notebook 4.1.x +* Jupyter Notebook 4.2.x * Conda R v3.2.x and channel * plyr, devtools, dplyr, ggplot2, tidyr, shiny, rmarkdown, forecast, stringr, rsqlite, reshape2, nycflights13, caret, rcurl, and randomforest pre-installed * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 12b1c3c8..076f4522 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -16,7 +16,7 @@ USER jovyan # Install Python 3 packages RUN conda install --quiet --yes \ - 'ipywidgets=4.1*' \ + 'ipywidgets=5.0*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ @@ -34,11 +34,13 @@ RUN conda install --quiet --yes \ 'bokeh=0.11*' \ 'h5py=2.5*' \ && conda clean -tipsy +# Activate ipywidgets extension in the environment that runs the notebook server +RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix # Install Python 2 packages RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ - 'ipython=4.1*' \ - 'ipywidgets=4.1*' \ + 'ipython=4.2*' \ + 'ipywidgets=5.0*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ diff --git a/scipy-notebook/README.md b/scipy-notebook/README.md index 518489fd..e6cd0c47 100644 --- a/scipy-notebook/README.md +++ b/scipy-notebook/README.md @@ -4,7 +4,7 @@ ## What it Gives You -* Jupyter Notebook 4.1.x +* Jupyter Notebook 4.2.x * Conda Python 3.x and Python 2.7.x environments * pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh pre-installed * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` From e14e387d6c73b8e54977ca812a97c1409f03b947 Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Fri, 29 Apr 2016 07:40:48 -0400 Subject: [PATCH 2/2] Require ipywidgets 5.1 5.0 had API compatibility problems see ipython/ipywidgets#522 (c) Copyright IBM Corp. 2016 --- pyspark-notebook/Dockerfile | 4 ++-- scipy-notebook/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 395b147c..d33179f0 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -46,7 +46,7 @@ USER jovyan # Install Python 3 packages RUN conda install --quiet --yes \ - 'ipywidgets=5.0*' \ + 'ipywidgets=5.1*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ @@ -60,7 +60,7 @@ RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix # Install Python 2 packages and kernel spec RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'ipython=4.2*' \ - 'ipywidgets=5.0*' \ + 'ipywidgets=5.1*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 076f4522..f1434029 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -16,7 +16,7 @@ USER jovyan # Install Python 3 packages RUN conda install --quiet --yes \ - 'ipywidgets=5.0*' \ + 'ipywidgets=5.1*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \ @@ -40,7 +40,7 @@ RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix # Install Python 2 packages RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'ipython=4.2*' \ - 'ipywidgets=5.0*' \ + 'ipywidgets=5.1*' \ 'pandas=0.17*' \ 'numexpr=2.5*' \ 'matplotlib=1.5*' \