Merge pull request #24 from robinhasse/main

Bugfix: follow renaming in mrremind

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '1188540'
+ValidationKey: '1210118'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

.github/workflows/check.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -23,7 +23,6 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
-            gamstransfer=?ignore
             any::lucode2
             any::covr
             any::madrat
@@ -36,7 +35,7 @@ jobs:
           # gms, goxygen, GDPuc) will usually have an outdated binary version
           # available; by using extra-packages we get the newest version
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: '^tests/testthat/_snaps/.*$'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c  # frozen: v4.6.0
     hooks:
     -   id: check-case-conflict
     -   id: check-json
@@ -15,7 +15,7 @@ repos:
     -   id: mixed-line-ending
 
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.4.0
+    rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9  # frozen: v0.4.2
     hooks:
     -   id: parsable-R
     -   id: deps-in-desc

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: 'mredgebuildings: Prepare data to be used by the EDGE-Buildings model'
-version: 0.6.0
-date-released: '2024-03-27'
+version: 0.6.1
+date-released: '2024-04-25'
 abstract: Prepare data to be used by the EDGE-Buildings model.
 authors:
 - family-names: Hasse

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mredgebuildings
 Title: Prepare data to be used by the EDGE-Buildings model
-Version: 0.6.0
-Date: 2024-03-27
+Version: 0.6.1
+Date: 2024-04-25
 Authors@R: c(
     person("Robin", "Hasse", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1818-3186")),
@@ -18,7 +18,7 @@ Depends:
     magclass (>= 6.11.0),
     mrdrivers (>= 1.0.0),
     mrcommons (>= 1.35.0),
-    mrremind
+    mrremind (>= 0.175.4)
 Imports:
     brick (>= 0.1.3),
     dplyr,
@@ -43,4 +43,4 @@ Suggests:
     testthat
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1

NAMESPACE

@@ -119,7 +119,6 @@ importFrom(openxlsx,read.xlsx)
 importFrom(plyr,revalue)
 importFrom(pracma,integral2)
 importFrom(quadprog,solve.QP)
-importFrom(quitte,aggregate_map)
 importFrom(quitte,as.quitte)
 importFrom(quitte,calc_addVariable)
 importFrom(quitte,getPeriods)

R/calcFloorspacePerCap.R

@@ -11,7 +11,7 @@
 calcFloorspacePerCap <- function() {
 
   # TODO: get rid of the mrremind dependency # nolint: todo_comment_linter
-  fs <- readSource("EDGE", "Floorspace") %>%
+  fs <- readSource("EdgeBuildings", "Floorspace") %>%
     mselect(variable = "residential", collapseNames = TRUE)
   getItems(fs, "scenario") <- sub("gdp_", "", getItems(fs, "scenario"))
 

R/calcLifetimeParams.R

@@ -76,7 +76,7 @@ calcLifetimeParams <- function(subtype) {
 
       # technologies given only with central estimate
       central <- inline.data.frame(
-        "subsector;     hs;   ean",
+        "subsector;     hs;  mean",
         "commercial;  ehp1;    21", # Commercial Rooftop Heat Pumps
         "commercial;  gabo;    25", # Commercial Gas-Fired Boilers
         "commercial;  reel;    18", # Commercial Electric Resistance Heaters

README.md

@@ -1,8 +1,8 @@
 # Prepare data to be used by the EDGE-Buildings model
 
-R package **mredgebuildings**, version **0.6.0**
+R package **mredgebuildings**, version **0.6.1**
 
-[![CRAN status](https://www.r-pkg.org/badges/version/mredgebuildings)](https://cran.r-project.org/package=mredgebuildings)  [![R build status](https://github.com/pik-piam/mredgebuildings/workflows/check/badge.svg)](https://github.com/pik-piam/mredgebuildings/actions) [![codecov](https://codecov.io/gh/pik-piam/mredgebuildings/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mredgebuildings) 
+[![CRAN status](https://www.r-pkg.org/badges/version/mredgebuildings)](https://cran.r-project.org/package=mredgebuildings)  [![R build status](https://github.com/pik-piam/mredgebuildings/workflows/check/badge.svg)](https://github.com/pik-piam/mredgebuildings/actions) [![codecov](https://codecov.io/gh/pik-piam/mredgebuildings/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mredgebuildings) [![r-universe](https://pik-piam.r-universe.dev/badges/mredgebuildings)](https://pik-piam.r-universe.dev/builds)
 
 ## Purpose and Functionality
 
@@ -38,7 +38,7 @@ In case of questions / problems please contact Robin Hasse <robin.hasse@pik-pots
 
 To cite package **mredgebuildings** in publications use:
 
-Hasse R, Führlich P, Levesque A, Tockhorn H (2024). _mredgebuildings: Prepare data to be used by the EDGE-Buildings model_. R package version 0.6.0, <https://github.com/pik-piam/mredgebuildings>.
+Hasse R, Führlich P, Levesque A, Tockhorn H (2024). _mredgebuildings: Prepare data to be used by the EDGE-Buildings model_. R package version 0.6.1, <https://github.com/pik-piam/mredgebuildings>.
 
 A BibTeX entry for LaTeX users is
 
@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
   title = {mredgebuildings: Prepare data to be used by the EDGE-Buildings model},
   author = {Robin Hasse and Pascal Führlich and Antoine Levesque and Hagen Tockhorn},
   year = {2024},
-  note = {R package version 0.6.0},
+  note = {R package version 0.6.1},
   url = {https://github.com/pik-piam/mredgebuildings},
 }
 ```