Merge pull request #213 from pascal-sauer/master

fix renv.lockfile not written to the correct location

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '62126626'
+ValidationKey: '62149654'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'madrat: May All Data be Reproducible and Transparent (MADRaT) *'
-version: 3.12.1
-date-released: '2024-07-02'
+version: 3.12.2
+date-released: '2024-07-03'
 abstract: Provides a framework which should improve reproducibility and transparency
   in data processing. It provides functionality such as automatic meta data creation
   and management, rudimentary quality management, data caching, work-flow management

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: madrat
 Title: May All Data be Reproducible and Transparent (MADRaT) *
-Version: 3.12.1
-Date: 2024-07-02
+Version: 3.12.2
+Date: 2024-07-03
 Authors@R: c(
     person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre"),
            comment = c(affiliation = "Potsdam Institute for Climate Impact Research", ORCID = "0000-0002-4309-6431")),

R/retrieveData.R

@@ -350,7 +350,7 @@ retrieveData <- function(model, rev = 0, dev = "", cachetype = "def", puc = iden
 
   vcat(3, paste(utils::capture.output({
     dummyProject <- withr::local_tempdir()
-    initHydrateSnapshotRenv <- function(requiredPackages) {
+    initHydrateSnapshotRenv <- function(requiredPackages, lockfilePath) {
       renv::init()
       # hydrate requiredPackages into throwaway renv to ensure they can be restored from cache on this machine
       if (utils::packageVersion("renv") >= numeric_version("0.17.0")) {
@@ -360,11 +360,12 @@ retrieveData <- function(model, rev = 0, dev = "", cachetype = "def", puc = iden
         renv::hydrate(packages = requiredPackages)
       }
       # create an renv.lock file documenting all package versions, see renv parameter of pucAggregate
-      renv::snapshot(type = "all", prompt = FALSE)
+      renv::snapshot(lockfile = file.path(lockfilePath, "renv.lock"), type = "all", prompt = FALSE)
     }
     # init renv in separate session to prevent changes to current session's libpath
-    callr::r(initHydrateSnapshotRenv, args = list(requiredPackages = requiredPackages),
-             wd = dummyProject, spinner = FALSE, show = TRUE)
+    callr::r(initHydrateSnapshotRenv, args = list(requiredPackages = requiredPackages,
+                                                  lockfilePath = normalizePath(".")),
+             wd = dummyProject, spinner = FALSE, show = TRUE, stderr = "2>&1")
 
     # (unlikely) caveat: if packages are updated while retrieveData is running a package's version
     # in the created renv.lock might not match the version used to run the full functions

README.md

@@ -1,6 +1,6 @@
 # May All Data be Reproducible and Transparent (MADRaT) *
 
-R package **madrat**, version **3.12.1**
+R package **madrat**, version **3.12.2**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/madrat)](https://cran.r-project.org/package=madrat) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1115490.svg)](https://doi.org/10.5281/zenodo.1115490) [![R build status](https://github.com/pik-piam/madrat/workflows/check/badge.svg)](https://github.com/pik-piam/madrat/actions) [![codecov](https://codecov.io/gh/pik-piam/madrat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/madrat) [![r-universe](https://pik-piam.r-universe.dev/badges/madrat)](https://pik-piam.r-universe.dev/builds)
 
@@ -55,7 +55,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
 
 To cite package **madrat** in publications use:
 
-Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2024). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.12.1, <https://github.com/pik-piam/madrat>.
+Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2024). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.12.2, <https://github.com/pik-piam/madrat>.
 
 A BibTeX entry for LaTeX users is
 
@@ -64,7 +64,7 @@ A BibTeX entry for LaTeX users is
   title = {madrat: May All Data be Reproducible and Transparent (MADRaT)},
   author = {Jan Philipp Dietrich and Lavinia Baumstark and Stephen Wirth and Anastasis Giannousakis and Renato Rodrigues and Benjamin Leon Bodirsky and Debbora Leip and Ulrich Kreidenweis and David Klein and Pascal Sauer},
   year = {2024},
-  note = {R package version 3.12.1},
+  note = {R package version 3.12.2},
   url = {https://github.com/pik-piam/madrat},
   doi = {10.5281/zenodo.1115490},
 }