Merge pull request #689 from fbenke-pik/refactor

Ensure backwards compatibility for reportEmi
pik-piam · Jan 31, 2025 · 513ff5c · 513ff5c
2 parents ab3b7a3 + bed24be
commit 513ff5c
Show file tree

Hide file tree

Showing 9 changed files with 4,526 additions and 1,726 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '234173520'
+ValidationKey: '234205279'
 AcceptedWarnings:
 - .*following variables are expected in the piamInterfaces.*
 - Summation checks have revealed some gaps.*

diff --git 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: 'remind2: The REMIND R package (2nd generation)'
-version: 1.164.0
-date-released: '2025-01-30'
+version: 1.164.1
+date-released: '2025-01-31'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:
 - family-names: Rodrigues

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.164.0
-Date: 2025-01-30
+Version: 1.164.1
+Date: 2025-01-31
 Authors@R: c(
     person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", role = "aut"),

diff --git a/NAMESPACE b/NAMESPACE
@@ -58,6 +58,7 @@ export(reportDIETER)
 export(reportEmi)
 export(reportEmiAirPol)
 export(reportEmiForClimateAssessment)
+export(reportEmiLegacy)
 export(reportEmployment)
 export(reportEnergyInvestment)
 export(reportExtraction)

diff --git a/R/reportEmi.R b/R/reportEmi.R
diff --git a/R/reportEmiLegacy.R b/R/reportEmiLegacy.R
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.164.0**
+R package **remind2**, version **1.164.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds)
 
@@ -49,15 +49,17 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2025). "remind2: The REMIND R package (2nd generation) - Version 1.164.0."
+Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2025). "remind2: The REMIND R package (2nd generation)." Version: 1.164.1, <https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
 @Misc{,
-  title = {remind2: The REMIND R package (2nd generation) - Version 1.164.0},
+  title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann and Tonn Rüter},
-  date = {2025-01-30},
+  date = {2025-01-31},
   year = {2025},
+  url = {https://github.com/pik-piam/remind2},
+  note = {Version: 1.164.1},
 }
 ```
diff --git a/man/reportEmiLegacy.Rd b/man/reportEmiLegacy.Rd
diff --git a/tests/testthat/test-convGDX2mif.R b/tests/testthat/test-convGDX2mif.R
@@ -1,5 +1,5 @@
 # uncomment to skip test
- skip("Skip GDX test")
+# skip("Skip GDX test")
 
 # Check REMIND output. dt is a data.table in *wide* format,
 # i.e., variables are columns. `eqs` is a list of equations of the form