Merge pull request #20 from jasenfinch/devel

v0.5.5
jasenfinch · Nov 9, 2021 · 3075db0 · 3075db0
2 parents e3bcc56 + 6a67e89
commit 3075db0
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 29 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: projecttemplates
 Title: Project Templates for Reproducible Research and Analyses
-Version: 0.5.4
+Version: 0.5.5
 Authors@R: 
     person(given = "Jasen",
            family = "Finch",

diff --git a/NAMESPACE b/NAMESPACE
@@ -16,7 +16,7 @@ export(targetsRun)
 export(targetsScript)
 export(template)
 export(utils)
-importFrom(callr,r)
+importFrom(callr,r_copycat)
 importFrom(gert,git_add)
 importFrom(gert,git_commit)
 importFrom(gert,git_init)

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,10 @@
-# projecttempaltes 0.5.4
+# projecttemplates 0.5.5
+
+* Fixed the use of user `renv` settings during initialisation to ensure that the user cache is used.
+
+* Simplified the `renv` cache restore term in the generated project Dockerfile.
+
+# projecttemplates 0.5.4
 
 * Fixed warning that is returned when directories in the project `path` do not exist prior to template generation.
 

diff --git a/R/docker.R b/R/docker.R
@@ -45,7 +45,7 @@ RUN Rscript -e "install.packages(c(\'renv\'), repos = c(CRAN = \'https://cloud.r
     
 COPY renv.lock renv.lock
 
-RUN Rscript -e "renv::consent(provided = TRUE); renv::restore(prompt = FALSE)"' 
+RUN Rscript -e "renv::restore()"' 
   } else {
     package_install <- '
     

diff --git a/R/renv.R b/R/renv.R
@@ -9,14 +9,14 @@
 #' renvInitialise(paste0(tempdir(),'/test_project'))
 #' }
 #' @importFrom renv snapshot hydrate
-#' @importFrom callr r
+#' @importFrom callr r_copycat
 #' @export
 
 renvInitialise <- function(project_directory,
                            bioc = character(),
                            github = character()){
   message('Initialising renv cache')
-  renv_init <- callr::r(function(project_directory,bioc,github){
+  renv_init <- r_copycat(function(project_directory,bioc,github){
 
     project_directory <- normalizePath(project_directory)
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -2,7 +2,7 @@ pandoc: 2.11.4
 pkgdown: 1.6.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2021-11-06T21:22Z
+last_built: 2021-11-09T09:24Z
 urls:
   reference: https://jasenfinch.github.io/projecttemplates//reference
   article: https://jasenfinch.github.io/projecttemplates//articles

diff --git a/docs/reference/createGit.html b/docs/reference/createGit.html
diff --git a/docs/reference/createGithub.html b/docs/reference/createGithub.html
diff --git a/docs/reference/docker.html b/docs/reference/docker.html
diff --git a/docs/reference/githubActions.html b/docs/reference/githubActions.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/output.html b/docs/reference/output.html
diff --git a/docs/reference/projectDirectory.html b/docs/reference/projectDirectory.html
diff --git a/docs/reference/projectSkeleton.html b/docs/reference/projectSkeleton.html
diff --git a/docs/reference/projectTypes.html b/docs/reference/projectTypes.html
diff --git a/docs/reference/readme.html b/docs/reference/readme.html
diff --git a/docs/reference/renvInitialise.html b/docs/reference/renvInitialise.html
diff --git a/docs/reference/targets.html b/docs/reference/targets.html
diff --git a/docs/reference/targetsPipeline.html b/docs/reference/targetsPipeline.html
diff --git a/docs/reference/targetsRun.html b/docs/reference/targetsRun.html
diff --git a/docs/reference/targetsScript.html b/docs/reference/targetsScript.html
diff --git a/docs/reference/template.html b/docs/reference/template.html
diff --git a/docs/reference/utils.html b/docs/reference/utils.html