diff --git a/.buildlibrary b/.buildlibrary index 53a042ca..2a26ffbb 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '2357040' +ValidationKey: '2556190' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 7d564a18..b75d0edf 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -56,6 +56,8 @@ jobs: - name: Test coverage shell: Rscript {0} - run: covr::codecov(quiet = FALSE) + run: | + nonDummyTests <- setdiff(list.files("./tests/testthat/"), c("test-dummy.R", "_snaps")) + if(length(nonDummyTests) > 0) covr::codecov(quiet = FALSE) env: NOT_CRAN: "true" diff --git a/CITATION.cff b/CITATION.cff index 30d55c71..31485866 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: 1.2.0 -date-released: '2023-10-12' +version: 1.3.0 +date-released: '2023-11-02' 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 8c068674..30889eab 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 1.2.0 +Version: 1.3.0 Authors@R: c( person("Alois", "Dirnaichner", email = "dirnaichner@pik-potsdam.de", role = c("aut", "cre")), person("Marianna", "Rottoli", email = "rottoli@pik-potsdam.de", role = "aut"), @@ -15,7 +15,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.2.3 VignetteBuilder: knitr -Date: 2023-10-12 +Date: 2023-11-02 Config/testthat/edition: 3 Imports: rmndt, diff --git a/README.md b/README.md index 08122768..a459da5b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **1.2.0** +R package **edgeTransport**, version **1.3.0** [![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 Alois Dirnaichner . +Dirnaichner A, Rottoli M, Hoppe J (2023). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 1.3.0, . 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 = {Alois Dirnaichner and Marianna Rottoli and Johanna Hoppe}, year = {2023}, - note = {R package version 1.2.0}, + note = {R package version 1.3.0}, url = {https://github.com/pik-piam/edgeTransport}, } ``` diff --git a/cache/RatioPPP2MER_country.RDS b/cache/RatioPPP2MER_country.RDS deleted file mode 100644 index 23ef0c81..00000000 Binary files a/cache/RatioPPP2MER_country.RDS and /dev/null differ