From cd35fd7835de65ae2afa79e3df7968019fa42363 Mon Sep 17 00:00:00 2001 From: robinhasse Date: Mon, 9 Sep 2024 15:37:09 +0200 Subject: [PATCH] Bugfix: handle forcecache of length > 1 --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/cacheName.R | 2 +- README.md | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 109b060..aef1bf8 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '62462280' +ValidationKey: '62541725' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index ae1ba94..865fe41 100644 --- a/CITATION.cff +++ b/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.13.0 -date-released: '2024-08-21' +version: 3.13.1 +date-released: '2024-09-09' 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 diff --git a/DESCRIPTION b/DESCRIPTION index 97633ab..230be3e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: madrat Title: May All Data be Reproducible and Transparent (MADRaT) * -Version: 3.13.0 -Date: 2024-08-21 +Version: 3.13.1 +Date: 2024-09-09 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")), diff --git a/R/cacheName.R b/R/cacheName.R index bb7b855..5cfed0c 100644 --- a/R/cacheName.R +++ b/R/cacheName.R @@ -54,7 +54,7 @@ cacheName <- function(prefix, type, args = NULL, graph = NULL, mode = "put", pa .fname <- function(prefix, type, fp, args) { return(paste0(getConfig("cachefolder"), "/", prefix, type, fp, args, ".rds")) } - if (mode == "put" && getConfig("forcecache") != FALSE) { + if (mode == "put" && !isFALSE(getConfig("forcecache"))) { # forcecache was at least partly active -> data consistency with # calculated hash is not guaranteed -> ignore hash return(.fname(prefix, type, "", args)) diff --git a/README.md b/README.md index c2232cb..a9d6934 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # May All Data be Reproducible and Transparent (MADRaT) * -R package **madrat**, version **3.13.0** +R package **madrat**, version **3.13.1** [![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 , R package version 3.13.0, . +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 , R package version 3.13.1, . 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.13.0}, + note = {R package version 3.13.1}, url = {https://github.com/pik-piam/madrat}, doi = {10.5281/zenodo.1115490}, }