diff --git a/.buildlibrary b/.buildlibrary index 902a8d32..09ac918e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '7131488' +ValidationKey: '7159110' 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 f754c9c1..c8fd69ff 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.6.4 -date-released: '2023-08-23' +version: 3.6.5 +date-released: '2023-09-14' 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 caa26012..a4099477 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: madrat Title: May All Data be Reproducible and Transparent (MADRaT) * -Version: 3.6.4 -Date: 2023-08-23 +Version: 3.6.5 +Date: 2023-09-14 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/calcOutput.R b/R/calcOutput.R index 9d7c0c91..dcb9fe8b 100644 --- a/R/calcOutput.R +++ b/R/calcOutput.R @@ -24,7 +24,7 @@ #' @param warnNA boolean deciding whether NAs in the data set should create a warning or not #' @param na_warning deprecated, please use \code{warnNA} instead #' @param try if set to TRUE the calculation will only be tried and the script will continue even if -#' the underlying calculation failed. If set to TRUE calculation will stop with an error in such a +#' the underlying calculation failed. If set to FALSE calculation will stop with an error in such a #' case. This setting will be overwritten by the global setting debug=TRUE, in which try will be #' always interpreted as TRUE. #' @param regionmapping alternative regionmapping to use for the given calculation. It will temporarily diff --git a/README.md b/README.md index 268077f2..79203af5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # May All Data be Reproducible and Transparent (MADRaT) * -R package **madrat**, version **3.6.4** +R package **madrat**, version **3.6.5** [![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 J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Führlich P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 , R package version 3.6.5, . 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 Führlich}, year = {2023}, - note = {R package version 3.6.4}, + note = {R package version 3.6.5}, doi = {10.5281/zenodo.1115490}, url = {https://github.com/pik-piam/madrat}, } diff --git a/man/calcOutput.Rd b/man/calcOutput.Rd index 3ce7542e..0e79847d 100644 --- a/man/calcOutput.Rd +++ b/man/calcOutput.Rd @@ -51,7 +51,7 @@ Works only when a file name is given in the function call.} \item{na_warning}{deprecated, please use \code{warnNA} instead} \item{try}{if set to TRUE the calculation will only be tried and the script will continue even if -the underlying calculation failed. If set to TRUE calculation will stop with an error in such a +the underlying calculation failed. If set to FALSE calculation will stop with an error in such a case. This setting will be overwritten by the global setting debug=TRUE, in which try will be always interpreted as TRUE.}