From eedf0cebdefaebace3c514f30c2a5d1c1f63034c Mon Sep 17 00:00:00 2001 From: Kristine Karstens Date: Wed, 17 Jan 2024 12:33:48 +0100 Subject: [PATCH] add AcceptedNotes for includes of non-default packages --- .buildlibrary | 6 ++++-- CITATION.cff | 4 ++-- DESCRIPTION | 6 +++--- R/fullCELLULARMAGPIE.R | 1 - R/imports.R | 2 +- README.md | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 88eb969d..000a3330 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,7 +1,9 @@ -ValidationKey: '27652938' +ValidationKey: '27674078' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' -AcceptedNotes: unable to verify current time +AcceptedNotes: +- unable to verify current time +- includes the non-default packages. allowLinterWarnings: no diff --git a/CITATION.cff b/CITATION.cff index 7776cc8c..04625e84 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: 'mrmagpie: madrat based MAgPIE Input Data Library' -version: 1.40.1 -date-released: '2024-01-16' +version: 1.40.2 +date-released: '2024-01-17' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: - family-names: Karstens diff --git a/DESCRIPTION b/DESCRIPTION index f1b03fdb..7284ac76 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.40.1 -Date: 2024-01-16 +Version: 1.40.2 +Date: 2024-01-17 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), @@ -27,6 +27,7 @@ Depends: magclass (>= 3.17), mrcommons (>= 1.37.0), mrland (>= 0.51.0), + mrsoil (>= 2.0.0), mrwater (>= 1.11.0), R (>= 3.5.0) Imports: @@ -39,7 +40,6 @@ Imports: luplot (>= 3.56.0), luscale, magpiesets, - mrsoil (>= 2.0.0), mstools, ncdf4, pbapply, diff --git a/R/fullCELLULARMAGPIE.R b/R/fullCELLULARMAGPIE.R index 454418b4..1e4e2a8e 100755 --- a/R/fullCELLULARMAGPIE.R +++ b/R/fullCELLULARMAGPIE.R @@ -40,7 +40,6 @@ #' @importFrom luplot plotregionscluster #' @importFrom ggplot2 ggsave #' @importFrom withr local_options -#' @import mrsoil fullCELLULARMAGPIE <- function(rev = 0.1, dev = "", ctype = "c200", diff --git a/R/imports.R b/R/imports.R index 417adcee..54954d12 100644 --- a/R/imports.R +++ b/R/imports.R @@ -1,4 +1,4 @@ # Generated by lucode2: do not edit by hand -#' @import madrat magclass mrcommons mrland mrwater +#' @import madrat magclass mrcommons mrland mrsoil mrwater NULL diff --git a/README.md b/README.md index 944fd91b..fe8028f3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.40.1** +R package **mrmagpie**, version **1.40.2** [![CRAN status](https://www.r-pkg.org/badges/version/mrmagpie)](https://cran.r-project.org/package=mrmagpie) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4319612.svg)](https://doi.org/10.5281/zenodo.4319612) [![R build status](https://github.com/pik-piam/mrmagpie/workflows/check/badge.svg)](https://github.com/pik-piam/mrmagpie/actions) [![codecov](https://codecov.io/gh/pik-piam/mrmagpie/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrmagpie) [![r-universe](https://pik-piam.r-universe.dev/badges/mrmagpie)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Kristine Karstens , R package version 1.40.1, . +Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2024). _mrmagpie: madrat based MAgPIE Input Data Library_. doi:10.5281/zenodo.4319612 , R package version 1.40.2, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrmagpie: madrat based MAgPIE Input Data Library}, author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Alexandre Köberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer}, year = {2024}, - note = {R package version 1.40.1}, + note = {R package version 1.40.2}, doi = {10.5281/zenodo.4319612}, url = {https://github.com/pik-piam/mrmagpie}, }