From 64c1934be50f34e0e4a15bd16dbe328eb5c86daf Mon Sep 17 00:00:00 2001 From: Jan Philipp Dietrich Date: Mon, 13 Nov 2023 14:30:50 +0100 Subject: [PATCH] bugfix in retrieveData (removed ... from arguments to be sent to full function) --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/retrieveData.R | 1 + README.md | 6 +++--- cran-comments.md | 1 + 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 7c6bfcdd..a79f51fa 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '7297199' +ValidationKey: '7318728' 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 9045598e..8020921d 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.7.1 -date-released: '2023-11-08' +version: 3.7.2 +date-released: '2023-11-13' 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 d2ef3b03..30e62ccf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: madrat Title: May All Data be Reproducible and Transparent (MADRaT) * -Version: 3.7.1 -Date: 2023-11-08 +Version: 3.7.2 +Date: 2023-11-13 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = "aut"), diff --git a/R/retrieveData.R b/R/retrieveData.R index 18f6af77..d3928d77 100644 --- a/R/retrieveData.R +++ b/R/retrieveData.R @@ -242,6 +242,7 @@ retrieveData <- function(model, rev = 0, dev = "", cachetype = "def", puc = iden if (!is.null(cfg$fullDefault)) { cfg$fullNow <- modifyList(cfg$fullDefault, cfg$input, keep.null = TRUE) cfg$fullNow <- cfg$fullNow[names(cfg$fullDefault)] + cfg$fullNow <- cfg$fullNow[names(cfg$fullNow) != "..."] } else { cfg$fullNow <- list() } diff --git a/README.md b/README.md index 3ad1762d..e76a81d2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # May All Data be Reproducible and Transparent (MADRaT) * -R package **madrat**, version **3.7.1** +R package **madrat**, version **3.7.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 , R package version 3.7.1, . +Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi: 10.5281/zenodo.1115490 (URL: https://doi.org/10.5281/zenodo.1115490), R package version 3.7.2, . 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 = {2023}, - note = {R package version 3.7.1}, + note = {R package version 3.7.2}, doi = {10.5281/zenodo.1115490}, url = {https://github.com/pik-piam/madrat}, } diff --git a/cran-comments.md b/cran-comments.md index b628b033..b69330fa 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,5 +1,6 @@ ## CHANGES * fixed numeric_version-related error currently showing up on r-devel machines on CRAN +* fixed pre-test error also related to numeric_version ## Test environments * local R installation, R 4.1.2