build

pik-piam · May 13, 2024 · c1d0fca · c1d0fca
1 parent fe9df43
commit c1d0fca
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: ''
+ValidationKey: '51228480'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package .* was built under R version'

diff --git a/CITATION.cff b/CITATION.cff
@@ -2,13 +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'
-<<<<<<< HEAD
-version: 2.57.0
-date-released: '2024-04-25'
-=======
-version: 2.56.14
+version: 2.58.0
 date-released: '2024-05-13'
->>>>>>> e1ea665410be3bc92c027112358a368171181cd7
 abstract: Package contains routines to prepare data for validation exercises.
 authors:
 - family-names: Bodirsky

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: mrvalidation
 Title: madrat data preparation for validation purposes
-Version: 2.57.0
-Date: 2024-04-25
+Version: 2.58.0
+Date: 2024-05-13
 Authors@R: c(
  person("Benjamin Leon", "Bodirsky", , "[email protected]", role = c("aut", "cre")),
  person("Stephen", "Wirth", role = "aut"),

diff --git a/R/imports.R b/R/imports.R
@@ -1,4 +1,4 @@
 # Generated by lucode2: do not edit by hand
 
-#' @import madrat magclass mrcommons mrdrivers mrfaocore mrlandcore mrmagpie mrfactors
+#' @import madrat magclass mrcommons mrdrivers mrfactors mrfaocore mrlandcore mrmagpie
 NULL
diff --git a/README.md b/README.md
@@ -1,10 +1,6 @@
 # madrat data preparation for validation purposes
 
-<<<<<<< HEAD
-R package **mrvalidation**, version **2.57.0**
-=======
-R package **mrvalidation**, version **2.56.14**
->>>>>>> e1ea665410be3bc92c027112358a368171181cd7
+R package **mrvalidation**, version **2.58.0**
 
 [![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)
 
@@ -43,11 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@
 
 To cite package **mrvalidation** in publications use:
 
-<<<<<<< HEAD
-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, von Jeetze P, Wang X, Dietrich J, Alves M (2024). _mrvalidation: madrat data preparation for validation purposes_. doi: 10.5281/zenodo.4317826 (URL: https://doi.org/10.5281/zenodo.4317826), R package version 2.57.0, <URL: https://github.com/pik-piam/mrvalidation>.
-=======
-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, von Jeetze P, Wang X, Dietrich J, Alves M (2024). _mrvalidation: madrat data preparation for validation purposes_. doi:10.5281/zenodo.4317826 <https://doi.org/10.5281/zenodo.4317826>, R package version 2.56.14, <https://github.com/pik-piam/mrvalidation>.
->>>>>>> e1ea665410be3bc92c027112358a368171181cd7
+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, von Jeetze P, Wang X, Dietrich J, Alves M (2024). _mrvalidation: madrat data preparation for validation purposes_. doi:10.5281/zenodo.4317826 <https://doi.org/10.5281/zenodo.4317826>, R package version 2.58.0, <https://github.com/pik-piam/mrvalidation>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,12 +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 Patrick {von Jeetze} and Xiaoxi Wang and Jan Philipp Dietrich and Marcos Alves},
  year = {2024},
-<<<<<<< HEAD
- note = {R package version 2.57.0},
- doi = {10.5281/zenodo.4317826},
-=======
- note = {R package version 2.56.14},
->>>>>>> e1ea665410be3bc92c027112358a368171181cd7
+ note = {R package version 2.58.0},
  url = {https://github.com/pik-piam/mrvalidation},
  doi = {10.5281/zenodo.4317826},
 }