From e2932c730aae4581a77813025b60b7b3df433da8 Mon Sep 17 00:00:00 2001 From: Romain C Date: Sun, 30 Dec 2018 08:46:34 +0100 Subject: [PATCH 1/2] Applied PR #786 for R packages to the datascience-notebook --- datascience-notebook/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 39bae3aa..7236f37d 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -47,24 +47,24 @@ USER $NB_UID # R packages including IRKernel which gets installed globally. RUN conda install --quiet --yes \ 'rpy2=2.8*' \ - 'r-base=3.4.1' \ + 'r-base=3.5.1' \ 'r-irkernel=0.8*' \ 'r-plyr=1.8*' \ 'r-devtools=1.13*' \ - 'r-tidyverse=1.1*' \ - 'r-shiny=1.0*' \ - 'r-rmarkdown=1.8*' \ + 'r-tidyverse=1.2*' \ + 'r-shiny=1.2*' \ + 'r-rmarkdown=1.11*' \ 'r-forecast=8.2*' \ - 'r-rsqlite=2.0*' \ + 'r-rsqlite=2.1*' \ 'r-reshape2=1.4*' \ - 'r-nycflights13=0.2*' \ + 'r-nycflights13=1.0*' \ 'r-caret=6.0*' \ 'r-rcurl=1.95*' \ 'r-crayon=1.3*' \ 'r-randomforest=4.6*' \ 'r-htmltools=0.3*' \ - 'r-sparklyr=0.7*' \ - 'r-htmlwidgets=1.0*' \ + 'r-sparklyr=0.9*' \ + 'r-htmlwidgets=1.2*' \ 'r-hexbin=1.27*' && \ conda clean -tipsy && \ fix-permissions $CONDA_DIR && \ From d18fd3e7eb560f865531b39c07ec412b8d3999bb Mon Sep 17 00:00:00 2001 From: Romain C Date: Sun, 30 Dec 2018 09:23:37 +0100 Subject: [PATCH 2/2] Fix a conflict in R packages update in the datascience-notebook --- datascience-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 7236f37d..27e4e284 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -46,7 +46,7 @@ USER $NB_UID # R packages including IRKernel which gets installed globally. RUN conda install --quiet --yes \ - 'rpy2=2.8*' \ + 'rpy2=2.9*' \ 'r-base=3.5.1' \ 'r-irkernel=0.8*' \ 'r-plyr=1.8*' \