From db9b030a399e0d5ee2d539bc7552617a2cd6e606 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 30 Oct 2020 15:53:16 -0500 Subject: [PATCH 1/2] [R-package] [docs] fix broken plots in pkgdown site (fixes #3276) --- docs/conf.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index ce4830f037c0..de5017f2a05b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -240,17 +240,18 @@ def generate_r_docs(app): The application object representing the Sphinx process. """ commands = """ - echo 'options(repos = "https://cran.rstudio.com")' > $HOME/.Rprofile - /home/docs/.conda/bin/conda create -q -y -n r_env \ - r-base=3.5.1=h1e0a451_2 \ - r-jsonlite=1.5=r351h96ca727_0 \ - r-matrix=1.2_14=r351h96ca727_0 \ - r-testthat=2.0.0=r351h29659fb_0 \ - cmake=3.14.0=h52cb24c_0 - /home/docs/.conda/bin/conda install -q -y -n r_env -c conda-forge \ - r-data.table=1.12.8=r35hcdcec82_0 \ - r-pkgdown=1.5.1=r35h6115d3f_0 \ - r-roxygen2=7.1.0=r35h0357c0b_0 + /home/docs/.conda/bin/conda create \ + -q \ + -y \ + -c conda-forge \ + -n r_env \ + cmake=3.14.0=h52cb24c_0 \ + r-base=4.0.3=hc603457_2 \ + r-data.table=1.13.2=r40h0eb13af_0 \ + r-jsonlite=1.7.1=r40hcdcec82_0 \ + r-matrix=1.2_18=r40h7fa42b6_3 \ + r-pkgdown=1.6.1=r40h6115d3f_0 \ + r-roxygen2=7.1.1=r40h0357c0b_0 source /home/docs/.conda/bin/activate r_env export TAR=/bin/tar cd {0} From 22f9dcb8b5b7afb3c39a98b7b470c1fbb8dd61ae Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 31 Oct 2020 22:04:03 -0500 Subject: [PATCH 2/2] upgrade CMake --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index de5017f2a05b..103e3f51fa16 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -245,7 +245,7 @@ def generate_r_docs(app): -y \ -c conda-forge \ -n r_env \ - cmake=3.14.0=h52cb24c_0 \ + cmake=3.18.2=ha30ef3c_0 \ r-base=4.0.3=hc603457_2 \ r-data.table=1.13.2=r40h0eb13af_0 \ r-jsonlite=1.7.1=r40hcdcec82_0 \