From 78fbbfeaf80e963453b1f968142b39ca722f56e7 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Fri, 2 Aug 2019 20:26:59 +0300
Subject: [PATCH 1/4] Update all scipy-notebook package versions

- New versions found with conda --upgrade
---
 scipy-notebook/Dockerfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile
index 7249e0f6fe..2a0ab0ee1b 100644
--- a/scipy-notebook/Dockerfile
+++ b/scipy-notebook/Dockerfile
@@ -18,28 +18,28 @@ USER $NB_UID
 RUN conda install --quiet --yes \
     'conda-forge::blas=*=openblas' \
     'ipywidgets=7.5*' \
-    'pandas=0.24*' \
+    'pandas=0.25*' \
     'numexpr=2.6*' \
     'matplotlib-base=3.1.*' \
-    'scipy=1.2*' \
+    'scipy=1.3*' \
     'seaborn=0.9*' \
-    'scikit-learn=0.20*' \
-    'scikit-image=0.14*' \
-    'sympy=1.3*' \
+    'scikit-learn=0.21*' \
+    'scikit-image=0.15*' \
+    'sympy=1.4*' \
     'cython=0.29*' \
     'patsy=0.5*' \
-    'statsmodels=0.9*' \
-    'cloudpickle=0.8*' \
-    'dill=0.2*' \
-    'dask=1.1.*' \
-    'numba=0.42*' \
-    'bokeh=1.0*' \
+    'statsmodels=0.10*' \
+    'cloudpickle=1.2*' \
+    'dill=0.3*' \
+    'dask=2.2.*' \
+    'numba=0.45*' \
+    'bokeh=1.3*' \
     'sqlalchemy=1.3*' \
     'hdf5=1.10*' \
     'h5py=2.9*' \
     'vincent=0.4.*' \
-    'beautifulsoup4=4.7.*' \
-    'protobuf=3.7.*' \
+    'beautifulsoup4=4.8.*' \
+    'protobuf=3.9.*' \
     'xlrd'  && \
     conda clean --all -f -y && \
     # Activate ipywidgets extension in the environment that runs the notebook server

From 686f9770d8bf1e0269f2765f81bc7bcb3e00b82d Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 4 Aug 2019 01:45:01 +0300
Subject: [PATCH 2/4] Update r-notebook package versions

---
 r-notebook/Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
index dd3448d5d4..5c67366d9d 100644
--- a/r-notebook/Dockerfile
+++ b/r-notebook/Dockerfile
@@ -25,16 +25,16 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'r-base=3.5.1' \
+    'r-base=3.6.1' \
     'r-rodbc=1.3*' \
     'unixodbc=2.3.*' \
-    'r-irkernel=0.8*' \
+    'r-irkernel=1.0*' \
     'r-plyr=1.8*' \
     'r-devtools=2.0*' \
     'r-tidyverse=1.2*' \
-    'r-shiny=1.2*' \
-    'r-rmarkdown=1.11*' \
-    'r-forecast=8.2*' \
+    'r-shiny=1.3*' \
+    'r-rmarkdown=1.14*' \
+    'r-forecast=8.7*' \
     'r-rsqlite=2.1*' \
     'r-reshape2=1.4*' \
     'r-nycflights13=1.0*' \
@@ -43,8 +43,8 @@ RUN conda install --quiet --yes \
     'r-crayon=1.3*' \
     'r-randomforest=4.6*' \
     'r-htmltools=0.3*' \
-    'r-sparklyr=0.9*' \
-    'r-htmlwidgets=1.2*' \
+    'r-sparklyr=1.0*' \
+    'r-htmlwidgets=1.3*' \
     'r-hexbin=1.27*' && \
     conda clean --all -f -y && \
     fix-permissions $CONDA_DIR

From f8d45e26481fb8168d91ef01ed2cbb6b37dfd8a8 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 4 Aug 2019 02:11:49 +0300
Subject: [PATCH 3/4] Update datascience notebook versions

---
 datascience-notebook/Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
index 075b0b459a..49441b36f9 100644
--- a/datascience-notebook/Dockerfile
+++ b/datascience-notebook/Dockerfile
@@ -46,14 +46,14 @@ USER $NB_UID
 # R packages including IRKernel which gets installed globally.
 RUN conda install --quiet --yes \
     'rpy2=2.9*' \
-    'r-base=3.5.1' \
-    'r-irkernel=0.8*' \
+    'r-base=3.6.1' \
+    'r-irkernel=1.0*' \
     'r-plyr=1.8*' \
-    'r-devtools=1.13*' \
+    'r-devtools=2.1*' \
     'r-tidyverse=1.2*' \
-    'r-shiny=1.2*' \
-    'r-rmarkdown=1.11*' \
-    'r-forecast=8.2*' \
+    'r-shiny=1.3*' \
+    'r-rmarkdown=1.14*' \
+    'r-forecast=8.7*' \
     'r-rsqlite=2.1*' \
     'r-reshape2=1.4*' \
     'r-nycflights13=1.0*' \
@@ -62,8 +62,8 @@ RUN conda install --quiet --yes \
     'r-crayon=1.3*' \
     'r-randomforest=4.6*' \
     'r-htmltools=0.3*' \
-    'r-sparklyr=0.9*' \
-    'r-htmlwidgets=1.2*' \
+    'r-sparklyr=1.0*' \
+    'r-htmlwidgets=1.3*' \
     'r-hexbin=1.27*' && \
     conda clean --all -f -y && \
     fix-permissions $CONDA_DIR && \

From fed5b9ac622f450027f27a311bf2ac138b2d1f64 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Sun, 4 Aug 2019 02:15:30 +0300
Subject: [PATCH 4/4] Update versions in all-spark-notebook

---
 all-spark-notebook/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
index e2ec6bbe11..204fcb84b2 100644
--- a/all-spark-notebook/Dockerfile
+++ b/all-spark-notebook/Dockerfile
@@ -23,10 +23,10 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'r-base=3.5.1' \
-    'r-irkernel=0.8*' \
-    'r-ggplot2=3.1*' \
-    'r-sparklyr=0.9*' \
+    'r-base=3.6.1' \
+    'r-irkernel=1.0*' \
+    'r-ggplot2=3.2*' \
+    'r-sparklyr=1.0*' \
     'r-rcurl=1.95*' && \
     conda clean --all -f -y && \
     fix-permissions $CONDA_DIR && \