Skip to content

Commit 1ea635f

Browse files
authored
Merge pull request #1105 from ttimbers/r4.0
r-notebook upgrade to R4.0
2 parents 04f7f60 + 6939527 commit 1ea635f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

docs/using/selecting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ repository. The following sections describe these images including their content
6060
[tidyr](http://tidyr.tidyverse.org/), [readr](http://readr.tidyverse.org/), [purrr](http://purrr.tidyverse.org/), [tibble](http://tibble.tidyverse.org/),
6161
[stringr](http://stringr.tidyverse.org/), [lubridate](http://lubridate.tidyverse.org/), and
6262
[broom](https://cran.r-project.org/web/packages/broom/vignettes/broom.html) from [conda-forge](https://conda-forge.github.io/feedstocks)
63-
* [plyr](https://cran.r-project.org/web/packages/plyr/index.html), [devtools](https://cran.r-project.org/web/packages/devtools/index.html),
63+
* [devtools](https://cran.r-project.org/web/packages/devtools/index.html),
6464
[shiny](https://shiny.rstudio.com/), [rmarkdown](http://rmarkdown.rstudio.com/), [forecast](https://cran.r-project.org/web/packages/forecast/forecast.pdf),
65-
[rsqlite](https://cran.r-project.org/web/packages/RSQLite/index.html), [reshape2](https://cran.r-project.org/web/packages/reshape2/reshape2.pdf),
66-
[nycflights13](https://cran.r-project.org/web/packages/nycflights13/index.html), [caret](http://topepo.github.io/caret/index.html),
65+
[rsqlite](https://cran.r-project.org/web/packages/RSQLite/index.html),
66+
[nycflights13](https://cran.r-project.org/web/packages/nycflights13/index.html), [caret](http://topepo.github.io/caret/index.html), [tidymodels](https://www.tidymodels.org/),
6767
[rcurl](https://cran.r-project.org/web/packages/RCurl/index.html), and [randomforest](https://cran.r-project.org/web/packages/randomForest/randomForest.pdf)
6868
packages from [conda-forge](https://conda-forge.github.io/feedstocks)
6969

r-notebook/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ USER $NB_UID
2525

2626
# R packages
2727
RUN conda install --quiet --yes \
28-
'r-base=3.6.3' \
29-
'r-caret=6.0*' \
28+
'r-base=4.0.0' \
29+
'r-caret=6.*' \
3030
'r-crayon=1.3*' \
3131
'r-devtools=2.3*' \
3232
'r-forecast=8.12*' \
@@ -35,16 +35,15 @@ RUN conda install --quiet --yes \
3535
'r-htmlwidgets=1.5*' \
3636
'r-irkernel=1.1*' \
3737
'r-nycflights13=1.0*' \
38-
'r-plyr=1.8*' \
3938
'r-randomforest=4.6*' \
4039
'r-rcurl=1.98*' \
41-
'r-reshape2=1.4*' \
42-
'r-rmarkdown=2.1*' \
40+
'r-rmarkdown=2.2*' \
4341
'r-rodbc=1.3*' \
4442
'r-rsqlite=2.2*' \
4543
'r-shiny=1.4*' \
4644
'r-tidyverse=1.3*' \
4745
'unixodbc=2.3.*' \
46+
'r-tidymodels=0.1*' \
4847
&& \
4948
conda clean --all -f -y && \
5049
fix-permissions "${CONDA_DIR}"

0 commit comments

Comments
 (0)