Merge pull request #42 from pfuehrlich-pik/master

remove superfluous R/.buildlibrary & R/.Rbuildignore, end files with newline to address warning

.Rbuildignore

@@ -9,3 +9,4 @@ carbon_stored.*
 ^\.github$
 ^codecov\.yml$
 ^\.pre-commit-config\.yaml$
+^workflow$

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '3062864'
+ValidationKey: '3081888'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

.github/workflows/lucode2-check.yaml

@@ -11,7 +11,7 @@ on:
 env:
   USE_BSPM: "true"
   _R_CHECK_FORCE_SUGGESTS_: "false"
-  NO_BINARY_INSTALL_R_PACKAGES: 'c("madrat", "magclass", "citation", "gms", "goxygen", "raster")'
+  NO_BINARY_INSTALL_R_PACKAGES: 'c("madrat", "magclass", "citation", "gms", "goxygen")'
 
 jobs:
   lucode2-check:
@@ -22,6 +22,9 @@ jobs:
 
       - name: Bootstrap
         run: |
+          sudo chown runner -R .
+          sudo locale-gen en_US.UTF-8
+          sudo add-apt-repository -y ppa:ubuntugis/ppa
           curl -OLs https://eddelbuettel.github.io/r-ci/run.sh
           chmod 0755 run.sh
           ./run.sh bootstrap
@@ -55,7 +58,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          ./run.sh install_aptget libgdal-dev
+          ./run.sh install_aptget libhdf5-dev
           ./run.sh install_all
           ./run.sh install_r lucode2 covr
 

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "mrcommons: MadRat commons Input Data Library",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "<p>Provides useful functions and a common structure to all the input data required to run models like MAgPIE\n    and REMIND of model input data.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mrcommons
 Type: Package
 Title: MadRat commons Input Data Library
-Version: 1.6.1
+Version: 1.6.2
 Date: 2022-02-01
 Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "[email protected]", role = "aut"),
              person("Kristine", "Karstens", role = "aut"),

R/calcCentralFeedshares.R

@@ -80,4 +80,4 @@ calcCentralFeedshares <- function(){
                max=1
    ))
 
-}
+}

R/calcFeedBasketsUncalibrated.R

@@ -130,4 +130,4 @@ calcFeedBasketsUncalibrated <- function() {
               unit="tDM / t DM",
               description="Uncalibrated feed requirements in DM per DM products generated for 5 livestock systems"))
 
-}
+}

R/calcFeedEfficiencyFuture.R

@@ -67,4 +67,4 @@ calcFeedEfficiencyFuture <- function(){
               description="Feed efficiency for dairy cattle, beef cattle, pigs, hens and broilers"
   ))
 
-}
+}

R/convertKoeppen.R

@@ -24,4 +24,4 @@ convertKoeppen<-function(x, subtype="iso") {
 
   } else stop("Cellular koeppen-geiger can not be converted to country level data. Use subtype='iso' for country level data.")
 
-}
+}

R/convertMAgPIE.R

@@ -128,4 +128,4 @@ convertMAgPIE <- function(x, subtype) {
   }
 
   return(y)
-}
+}

R/correctFoodSystemsDashboard.R

@@ -18,4 +18,4 @@ correctFoodSystemsDashboard <- function(x, subtype){
   }
 return(x)  
 
-}
+}

README.md

@@ -1,6 +1,6 @@
 # MadRat commons Input Data Library
 
-R package **mrcommons**, version **1.6.1**
+R package **mrcommons**, version **1.6.2**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrcommons)](https://cran.r-project.org/package=mrcommons) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822009.svg)](https://doi.org/10.5281/zenodo.3822009) [![R build status](https://github.com/pik-piam/mrcommons/workflows/check/badge.svg)](https://github.com/pik-piam/mrcommons/actions) [![codecov](https://codecov.io/gh/pik-piam/mrcommons/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrcommons) [![r-universe](https://pik-piam.r-universe.dev/badges/mrcommons)](https://pik-piam.r-universe.dev/ui#builds)
 
@@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
 
 To cite package **mrcommons** in publications use:
 
-Bodirsky B, Karstens K, Baumstark L, Weindl I, Wang X, Mishra A, Wirth S, Stevanovic M, Steinmetz N, Kreidenweis U, Rodrigues R, Popov R, Humpenoeder F, Giannousakis A, Levesque A, Klein D, Araujo E, Beier F, Oeser J, Pehl M, Leip D, Crawford M, Molina Bacca E, von Jeetze P, Martinelli E, Schreyer F, Soergel B, Dietrich J (2022). _mrcommons: MadRat commons Input Data Library_. doi: 10.5281/zenodo.3822009 (URL: https://doi.org/10.5281/zenodo.3822009), R package version 1.6.1, <URL: https://github.com/pik-piam/mrcommons>.
+Bodirsky B, Karstens K, Baumstark L, Weindl I, Wang X, Mishra A, Wirth S, Stevanovic M, Steinmetz N, Kreidenweis U, Rodrigues R, Popov R, Humpenoeder F, Giannousakis A, Levesque A, Klein D, Araujo E, Beier F, Oeser J, Pehl M, Leip D, Crawford M, Molina Bacca E, von Jeetze P, Martinelli E, Schreyer F, Soergel B, Dietrich J (2022). _mrcommons: MadRat commons Input Data Library_. doi: 10.5281/zenodo.3822009 (URL: https://doi.org/10.5281/zenodo.3822009), R package version 1.6.2, <URL: https://github.com/pik-piam/mrcommons>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is
   title = {mrcommons: MadRat commons Input Data Library},
   author = {Benjamin Leon Bodirsky and Kristine Karstens and Lavinia Baumstark and Isabelle Weindl and Xiaoxi Wang and Abhijeet Mishra and Stephen Wirth and Mishko Stevanovic and Nele Steinmetz and Ulrich Kreidenweis and Renato Rodrigues and Roman Popov and Florian Humpenoeder and Anastasis Giannousakis and Antoine Levesque and David Klein and Ewerton Araujo and Felicitas Beier and Julian Oeser and Michaja Pehl and Debbora Leip and Michael Crawford and Edna {Molina Bacca} and Patrick {von Jeetze} and Eleonora Martinelli and Felix Schreyer and Bjoern Soergel and Jan Philipp Dietrich},
   year = {2022},
-  note = {R package version 1.6.1},
+  note = {R package version 1.6.2},
   doi = {10.5281/zenodo.3822009},
   url = {https://github.com/pik-piam/mrcommons},
 }