Merge pull request #1105 from ttimbers/r4.0

r-notebook upgrade to R4.0
jupyter · Jun 25, 2020 · 1ea635f · 1ea635f
2 parents 04f7f60 + 6939527
commit 1ea635f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/docs/using/selecting.md b/docs/using/selecting.md
@@ -60,10 +60,10 @@ repository. The following sections describe these images including their content
 [tidyr](http://tidyr.tidyverse.org/), [readr](http://readr.tidyverse.org/), [purrr](http://purrr.tidyverse.org/), [tibble](http://tibble.tidyverse.org/),
 [stringr](http://stringr.tidyverse.org/), [lubridate](http://lubridate.tidyverse.org/), and
 [broom](https://cran.r-project.org/web/packages/broom/vignettes/broom.html) from [conda-forge](https://conda-forge.github.io/feedstocks)
-* [plyr](https://cran.r-project.org/web/packages/plyr/index.html), [devtools](https://cran.r-project.org/web/packages/devtools/index.html),
+* [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), [reshape2](https://cran.r-project.org/web/packages/reshape2/reshape2.pdf),
-[nycflights13](https://cran.r-project.org/web/packages/nycflights13/index.html), [caret](http://topepo.github.io/caret/index.html),
+[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), [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
@@ -25,8 +25,8 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
- 'r-base=3.6.3' \
- 'r-caret=6.0*' \
+ 'r-base=4.0.0' \
+ 'r-caret=6.*' \
  'r-crayon=1.3*' \
  'r-devtools=2.3*' \
  'r-forecast=8.12*' \
@@ -35,16 +35,15 @@ RUN conda install --quiet --yes \
  'r-htmlwidgets=1.5*' \
  'r-irkernel=1.1*' \
  'r-nycflights13=1.0*' \
- 'r-plyr=1.8*' \
  'r-randomforest=4.6*' \
  'r-rcurl=1.98*' \
- 'r-reshape2=1.4*' \
- 'r-rmarkdown=2.1*' \
+ 'r-rmarkdown=2.2*' \
  'r-rodbc=1.3*' \
  'r-rsqlite=2.2*' \
  'r-shiny=1.4*' \
  'r-tidyverse=1.3*' \
  'unixodbc=2.3.*' \
+ 'r-tidymodels=0.1*' \
  && \
  conda clean --all -f -y && \
  fix-permissions "${CONDA_DIR}"