From d1127f63df295fa2b4fc31df6b9837f8844c9457 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Wed, 6 Oct 2021 16:10:42 -0400 Subject: [PATCH 1/2] allow readr to update --- .github/workflows/r-ci.yml | 7 +------ facebook/delphiFacebook/DESCRIPTION | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/r-ci.yml b/.github/workflows/r-ci.yml index 9f81ca991..b96e8477f 100644 --- a/.github/workflows/r-ci.yml +++ b/.github/workflows/r-ci.yml @@ -48,17 +48,12 @@ jobs: ${{ runner.os }}-r-facebook-survey- - name: Install R dependencies run: | - if ( !require("readr") || packageVersion("readr") != "1.4.0" ) { - install.packages("devtools") - devtools::install_version("readr", version = "1.4.0") - } - if ( !require("remotes") ) { install.packages("remotes") } remotes::update_packages(c("rcmdcheck", "mockr", "remotes"), upgrade="always") dependency_list <- remotes::dev_package_deps(dependencies=TRUE) - remotes::update_packages(dependency_list$package[dependency_list$package != "readr"], upgrade="always") + remotes::update_packages(dependency_list$package, upgrade="always") shell: Rscript {0} - name: Check run: | diff --git a/facebook/delphiFacebook/DESCRIPTION b/facebook/delphiFacebook/DESCRIPTION index f9c2a08c4..ebc5011e8 100644 --- a/facebook/delphiFacebook/DESCRIPTION +++ b/facebook/delphiFacebook/DESCRIPTION @@ -13,7 +13,7 @@ Depends: Imports: stats, rlang, - readr (<= 1.4.0), + readr, dplyr, stringi, jsonlite, From 3be7f4ca741fd7ab25a32fd47875cb20e1c20fe8 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Wed, 6 Oct 2021 16:44:05 -0400 Subject: [PATCH 2/2] allow dockerfile to use recent readr --- facebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/facebook/Dockerfile b/facebook/Dockerfile index d78599349..48ef74e4e 100644 --- a/facebook/Dockerfile +++ b/facebook/Dockerfile @@ -10,9 +10,9 @@ RUN install2.r --error \ data.table \ roxygen2 \ Rcpp \ - BH + BH \ + readr -RUN R --no-restore --no-save -e 'devtools::install_version("readr", version="1.4.0")' RUN apt-get update && apt-get install -qq -y \ python3-venv \ sshpass \