Merge pull request #210 from pascal-sauer/master

defer toolAggregate warning until July 1st

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '61875180'
+ValidationKey: '61926200'
 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.11.4
-date-released: '2024-05-27'
+version: 3.11.5
+date-released: '2024-06-06'
 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,20 +1,27 @@
 Type: Package
 Package: madrat
 Title: May All Data be Reproducible and Transparent (MADRaT) *
-Version: 3.11.4
-Date: 2024-05-27
+Version: 3.11.5
+Date: 2024-06-06
 Authors@R: c(
-    person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", 
-    comment = c(affiliation = "Potsdam Institute for Climate Impact Research", ORCID = "0000-0002-4309-6431"), role = c("aut", "cre")),
-    person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut"),
-    person("Stephen", "Wirth", , "wirth@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut"),
+    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")),
+    person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research")),
+    person("Stephen", "Wirth", , "wirth@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research")),
     person("Anastasis", "Giannousakis", , "giannou@pik-potsdam.de", role = "aut"),
-    person("Renato", "Rodrigues", , "Renato.Rodrigues@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut"),
-    person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut"),
-    person("Debbora", "Leip", , "leip@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut"),
+    person("Renato", "Rodrigues", , "Renato.Rodrigues@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research")),
+    person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research")),
+    person("Debbora", "Leip", , "leip@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research")),
     person("Ulrich", "Kreidenweis", , "kreidenweis@pik-potsdam.de", role = "aut"),
-    person("David", "Klein", , "dklein@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut"),
-    person("Pascal", "Sauer", , "pascal.sauer@pik-potsdam.de", comment = c(affiliation = "Potsdam Institute for Climate Impact Research"), role = "aut")
+    person("David", "Klein", , "dklein@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research")),
+    person("Pascal", "Sauer", , "pascal.sauer@pik-potsdam.de", role = "aut",
+           comment = c(affiliation = "Potsdam Institute for Climate Impact Research"))
   )
 Description: Provides a framework which should improve reproducibility and
     transparency in data processing. It provides functionality such as
@@ -47,16 +54,16 @@ Imports:
 Suggests:
     covr,
     ggplot2,
+    graphics,
+    grDevices,
     knitr,
     rmarkdown,
     terra,
     testthat,
-    tibble,
-    grDevices,
-    graphics
+    tibble
 VignetteBuilder:
     knitr
+Config/Keywords: tool
 Encoding: UTF-8
 LazyData: no
 RoxygenNote: 7.3.1
-Config/Keywords: tool

R/toolAggregate.R

@@ -255,7 +255,7 @@ toolAggregate <- function(x, rel, weight = NULL, from = NULL, to = NULL, dim = 1
         msg <- paste0("Weight sum is 0, so cannot normalize and will return 0 for some ",
                       "aggregation targets. This changes the total sum of the magpie object! ",
                       'If this is really intended set zeroWeight = "allow".')
-        if (Sys.Date() < "2024-06-01") {
+        if (Sys.Date() < "2024-07-01") {
           message(msg)
         } else {
           warning(msg)

README.md

@@ -1,6 +1,6 @@
 # May All Data be Reproducible and Transparent (MADRaT) *
 
-R package **madrat**, version **3.11.4**
+R package **madrat**, version **3.11.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@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.11.4, <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.11.5, <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.11.4},
+  note = {R package version 3.11.5},
   url = {https://github.com/pik-piam/madrat},
   doi = {10.5281/zenodo.1115490},
 }