From a883ce1794d2421bc6f986b9b6f59dc309dee9d4 Mon Sep 17 00:00:00 2001
From: ttimbers <tiffany.timbers@gmail.com>
Date: Fri, 5 Jun 2020 14:41:12 -0700
Subject: [PATCH] versions and tidymodels

- added versions to ggplot2 and sparklyr for all-spark-notebook
- added tidymodels to r-notebook and docs

closes #1102
---
 all-spark-notebook/Dockerfile | 2 +-
 docs/using/selecting.md       | 2 +-
 r-notebook/Dockerfile         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
index 29c0f0ba..fe4bc137 100644
--- a/all-spark-notebook/Dockerfile
+++ b/all-spark-notebook/Dockerfile
@@ -23,7 +23,7 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'r-base=3.6.3' \
+    'r-base=4.0*' \
     'r-ggplot2=3.3*' \
     'r-irkernel=1.1*' \
     'r-rcurl=1.98*' \
diff --git a/docs/using/selecting.md b/docs/using/selecting.md
index 4b6239a7..d61e3c22 100644
--- a/docs/using/selecting.md
+++ b/docs/using/selecting.md
@@ -63,7 +63,7 @@ repository. The following sections describe these images including their content
 * [devtools](https://cran.r-project.org/web/packages/devtools/index.html),
 [shiny](https://shiny.rstudio.com/), [rmarkdown](http://rmarkdown.rstudio.com/), [forecast](https://cran.r-project.org/web/packages/forecast/forecast.pdf),
 [rsqlite](https://cran.r-project.org/web/packages/RSQLite/index.html),
-[nycflights13](https://cran.r-project.org/web/packages/nycflights13/index.html), [caret](http://topepo.github.io/caret/index.html),
+[nycflights13](https://cran.r-project.org/web/packages/nycflights13/index.html), [caret](http://topepo.github.io/caret/index.html), [tidymodels](https://www.tidymodels.org/),
 [rcurl](https://cran.r-project.org/web/packages/RCurl/index.html), and [randomforest](https://cran.r-project.org/web/packages/randomForest/randomForest.pdf)
 packages from [conda-forge](https://conda-forge.github.io/feedstocks)
 
diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
index b92e2130..9b6be9bb 100644
--- a/r-notebook/Dockerfile
+++ b/r-notebook/Dockerfile
@@ -43,6 +43,7 @@ RUN conda install --quiet --yes -c conda-forge \
     'r-shiny=1.4*' \
     'r-tidyverse=1.3*' \
     'unixodbc=2.3.*' \
+    'r-tidymodels=0.1*' \
     && \
     conda clean --all -f -y && \
     fix-permissions $CONDA_DIR