From 62c4c739b7bab358690190533ade643f88a84207 Mon Sep 17 00:00:00 2001 From: caviddhen Date: Mon, 23 Oct 2023 11:10:46 +0200 Subject: [PATCH] fix mappings warning validCostsTranspor --- .buildlibrary | 2 +- .github/workflows/check.yaml | 4 +++- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/calcValidCostsTransport.R | 2 +- README.md | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 60136c6..8cdd326 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '49429336' +ValidationKey: '49466601' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 7d564a1..b75d0ed 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 2de0559..185772b 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: 'mrvalidation: madrat data preparation for validation purposes' -version: 2.51.6 -date-released: '2023-10-16' +version: 2.51.7 +date-released: '2023-10-23' abstract: Package contains routines to prepare data for validation exercises. authors: - family-names: Bodirsky diff --git a/DESCRIPTION b/DESCRIPTION index 3a5a3d8..9a7cbdd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrvalidation Title: madrat data preparation for validation purposes -Version: 2.51.6 -Date: 2023-10-16 +Version: 2.51.7 +Date: 2023-10-23 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Stephen", "Wirth", role = "aut"), diff --git a/R/calcValidCostsTransport.R b/R/calcValidCostsTransport.R index 50f1040..8a0944e 100644 --- a/R/calcValidCostsTransport.R +++ b/R/calcValidCostsTransport.R @@ -114,7 +114,7 @@ calcValidCostsTransport <- function(datasource = "GTAPtransport") { out <- costs[, , products] * productionDistance[, , products] - mapping <- toolGetMapping(name = "CountryToCellMapping.csv", type = "cell") + mapping <- toolGetMapping(name = "CountryToCellMapping.csv", type = "cell", where = "mappingfolder") out <- toolAggregate(out, rel = mapping, from = "celliso", to = "iso", dim = 1) out <- toolCountryFill(out, fill = 0) diff --git a/README.md b/README.md index 1f2af37..6a4d86f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat data preparation for validation purposes -R package **mrvalidation**, version **2.51.6** +R package **mrvalidation**, version **2.51.7** [![CRAN status](https://www.r-pkg.org/badges/version/mrvalidation)](https://cran.r-project.org/package=mrvalidation) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4317826.svg)](https://doi.org/10.5281/zenodo.4317826) [![R build status](https://github.com/pik-piam/mrvalidation/workflows/check/badge.svg)](https://github.com/pik-piam/mrvalidation/actions) [![codecov](https://codecov.io/gh/pik-piam/mrvalidation/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrvalidation) [![r-universe](https://pik-piam.r-universe.dev/badges/mrvalidation)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky . +Bodirsky B, Wirth S, Karstens K, Humpenoeder F, Stevanovic M, Mishra A, Biewald A, Weindl I, Beier F, Chen D, Crawford M, Leip D, Molina Bacca E, Kreidenweis U, W. Yalew A, Humpenoeder F, von Jeetze P, Wang X, Dietrich J, Alves M (2023). _mrvalidation: madrat data preparation for validation purposes_. doi: 10.5281/zenodo.4317826 (URL: https://doi.org/10.5281/zenodo.4317826), R package version 2.51.7, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrvalidation: madrat data preparation for validation purposes}, author = {Benjamin Leon Bodirsky and Stephen Wirth and Kristine Karstens and Florian Humpenoeder and Mishko Stevanovic and Abhijeet Mishra and Anne Biewald and Isabelle Weindl and Felicitas Beier and David Chen and Michael Crawford and Debbora Leip and Edna {Molina Bacca} and Ulrich Kreidenweis and Amsalu {W. Yalew} and Florian {Humpenoeder } and Patrick {von Jeetze } and Xiaoxi Wang and Jan Philipp Dietrich and Marcos Alves}, year = {2023}, - note = {R package version 2.51.6}, + note = {R package version 2.51.7}, doi = {10.5281/zenodo.4317826}, url = {https://github.com/pik-piam/mrvalidation}, }