From d91df74ae0674e13ec4d1cf1b56cd86f14cfe9e1 Mon Sep 17 00:00:00 2001 From: David Klein Date: Fri, 12 Jan 2024 14:15:16 +0100 Subject: [PATCH] Increase version number Update help files --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- NAMESPACE | 1 - README.md | 6 +++--- man/as_tibble.magpie.Rd | 2 +- man/read.report.Rd | 5 ++++- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 40695694..a718e711 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '120963290' +ValidationKey: '120989154' 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 b1c2f2e0..30e3e377 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: 'magclass: Data Class and Tools for Handling Spatial-Temporal Data' -version: 6.13.0 -date-released: '2024-01-11' +version: 6.13.1 +date-released: '2024-01-12' abstract: Data class for increased interoperability working with spatial-temporal data together with corresponding functions and methods (conversions, basic calculations and basic data manipulation). The class distinguishes between spatial, temporal diff --git a/DESCRIPTION b/DESCRIPTION index 5617db39..e2c85adc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: magclass Title: Data Class and Tools for Handling Spatial-Temporal Data -Version: 6.13.0 -Date: 2024-01-11 +Version: 6.13.1 +Date: 2024-01-12 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = "aut"), diff --git a/NAMESPACE b/NAMESPACE index 79b1334e..74f40977 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -4,7 +4,6 @@ S3method(head,magpie) S3method(print,magpie) S3method(str,magpie) S3method(tail,magpie) -S3method(tibble::as_tibble,magpie) export("copy.attributes<-") export("getCells<-") export("getComment<-") diff --git a/README.md b/README.md index 165decb9..02c3bb8b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Data Class and Tools for Handling Spatial-Temporal Data -R package **magclass**, version **6.13.0** +R package **magclass**, version **6.13.1** [![CRAN status](https://www.r-pkg.org/badges/version/magclass)](https://cran.r-project.org/package=magclass) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158580.svg)](https://doi.org/10.5281/zenodo.1158580) [![R build status](https://github.com/pik-piam/magclass/workflows/check/badge.svg)](https://github.com/pik-piam/magclass/actions) [![codecov](https://codecov.io/gh/pik-piam/magclass/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magclass) [![r-universe](https://pik-piam.r-universe.dev/badges/magclass)](https://pik-piam.r-universe.dev/builds) @@ -56,7 +56,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 6.13.0, . +Dietrich J, Bodirsky B, Bonsch M, Humpenoeder F, Bi S, Karstens K, Leip D, Sauer P (2024). _magclass: Data Class and Tools for Handling Spatial-Temporal Data_. doi:10.5281/zenodo.1158580 , R package version 6.13.1, . A BibTeX entry for LaTeX users is @@ -65,7 +65,7 @@ A BibTeX entry for LaTeX users is title = {magclass: Data Class and Tools for Handling Spatial-Temporal Data}, author = {Jan Philipp Dietrich and Benjamin Leon Bodirsky and Markus Bonsch and Florian Humpenoeder and Stephen Bi and Kristine Karstens and Debbora Leip and Pascal Sauer}, year = {2024}, - note = {R package version 6.13.0}, + note = {R package version 6.13.1}, url = {https://github.com/pik-piam/magclass}, doi = {10.5281/zenodo.1158580}, } diff --git a/man/as_tibble.magpie.Rd b/man/as_tibble.magpie.Rd index da8f34d5..79bd9498 100644 --- a/man/as_tibble.magpie.Rd +++ b/man/as_tibble.magpie.Rd @@ -4,7 +4,7 @@ \alias{as_tibble.magpie} \title{magpie method for tibble::as_tibble} \usage{ -as_tibble.magpie( +\method{as_tibble}{magpie}( x, ..., .rows = NULL, diff --git a/man/read.report.Rd b/man/read.report.Rd index 2aa49153..ea78cd26 100644 --- a/man/read.report.Rd +++ b/man/read.report.Rd @@ -4,7 +4,7 @@ \alias{read.report} \title{Read file in report format} \usage{ -read.report(file, as.list = TRUE) +read.report(file, as.list = TRUE, showSeparatorWarning = TRUE) } \arguments{ \item{file}{file name the object should be read from.} @@ -13,6 +13,9 @@ read.report(file, as.list = TRUE) merge all information in one MAgPIE object (still under development and works currently only if the entries for the different models and scenarios have exactly the same regions and years).} + +\item{showSeparatorWarning}{Boolean (default value TRUE) that decides whether the warning +about the replacement of dots in variable names is displayed (default value) or not.} } \description{ This function reads the content of a reporting file (a file in the model