From fcff67ef1a6fa32bd615e97cb59c2f179ae1677f Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 11 Oct 2024 18:38:39 +0200 Subject: [PATCH] increment version --- .buildlibrary | 2 +- .github/workflows/check.yaml | 16 ++++++++-------- CITATION.cff | 2 +- DESCRIPTION | 3 +-- NAMESPACE | 1 + R/imports.R | 2 +- README.md | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 1d1a312..d54967d 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '5441904' +ValidationKey: '5461911' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index f6ea5d4..23545e6 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,14 +23,14 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | - any::lucode2 - any::covr - any::madrat - any::magclass - any::citation - any::gms - any::goxygen - any::GDPuc + lucode2 + covr + madrat + magclass + citation + gms + goxygen + GDPuc # piam packages also available on CRAN (madrat, magclass, citation, # gms, goxygen, GDPuc) will usually have an outdated binary version # available; by using extra-packages we get the newest version diff --git a/CITATION.cff b/CITATION.cff index 9da4e77..9376674 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ 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.7.2 +version: 2.7.3 date-released: '2024-10-11' 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. diff --git a/DESCRIPTION b/DESCRIPTION index 0583cf7..574fcd6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.7.2 +Version: 2.7.3 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -31,7 +31,6 @@ Imports: gdxrrw, zoo, gdxdt, - GDPuc, reporttransport (>= 0.0.13) Suggests: testthat (>= 3.0.0), diff --git a/NAMESPACE b/NAMESPACE index f903ffc..55c6501 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -23,6 +23,7 @@ export(toolOrderandCheck) export(toolPrepareScenInputData) export(toolTraverseDecisionTree) export(toolUpdateEndogenousCosts) +import(GDPuc) import(data.table) import(mrtransport) importFrom(data.table,fread) diff --git a/R/imports.R b/R/imports.R index 622a886..bc9536a 100644 --- a/R/imports.R +++ b/R/imports.R @@ -1,4 +1,4 @@ # Generated by lucode2: do not edit by hand -#' @import data.table mrtransport +#' @import data.table mrtransport GDPuc NULL diff --git a/README.md b/README.md index f574dbb..870f065 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.7.2** +R package **edgeTransport**, version **2.7.3** [![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.7.3, . 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.7.2}, + note = {R package version 2.7.3}, url = {https://github.com/pik-piam/edgeTransport}, } ```