From 3e42c55ca76a27da5da4b7e78693e3323cd70edc Mon Sep 17 00:00:00 2001 From: ahagen Date: Tue, 26 Nov 2024 15:43:41 +0100 Subject: [PATCH 1/2] fix DESCRIPTION --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 7 ++++--- README.md | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 4738eb1..46b39c0 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '42122949' +ValidationKey: '42151406' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 58975b1..942362d 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: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model' -version: 2.10.1 -date-released: '2024-11-22' +version: 2.10.2 +date-released: '2024-11-26' abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation with a high level of detail in its representation of technological and modal options. It is a partial equilibrium model with a nested multinomial logit structure and diff --git a/DESCRIPTION b/DESCRIPTION index a72e722..b057f79 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.10.1 +Version: 2.10.2 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -19,7 +19,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.3.2 VignetteBuilder: knitr -Date: 2024-11-22 +Date: 2024-11-26 Config/testthat/edition: 3 Imports: rmndt, @@ -37,4 +37,5 @@ Suggests: testthat (>= 3.0.0), knitr, markdown, - covr + covr, + piamPlotComparison diff --git a/README.md b/README.md index f117218..121c1ea 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.10.1** +R package **edgeTransport**, version **2.10.2** [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport) [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds) @@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe . +Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.10.2, . A BibTeX entry for LaTeX users is @@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model}, author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel}, year = {2024}, - note = {R package version 2.10.1}, + note = {R package version 2.10.2}, url = {https://github.com/pik-piam/edgeTransport}, } ``` From 9d0d3cf7bbceadfaf1f5bbd1f9d29ae4b5aaf306 Mon Sep 17 00:00:00 2001 From: ahagen Date: Tue, 26 Nov 2024 15:45:54 +0100 Subject: [PATCH 2/2] fix DESCRIPTION --- DESCRIPTION | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index b057f79..44d0f04 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -38,4 +38,5 @@ Suggests: knitr, markdown, covr, - piamPlotComparison + piamPlotComparison, + renv