increment version

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '3071480'
+ValidationKey: '3091608'
 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
 
@@ -36,7 +36,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
 

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: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model'
-version: 1.5.5
-date-released: '2024-04-03'
+version: 1.5.6
+date-released: '2024-04-05'
 abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation
   with a high level of detail in its representation of technological and modal options.
   It is a partial equilibrium model with a nested multinomial logit structure and

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: edgeTransport
 Title: Prepare EDGE Transport Data for the REMIND model
-Version: 1.5.5
+Version: 1.5.6
 Authors@R: c(
     person("Alois", "Dirnaichner", email = "[email protected]", role = c("aut", "cre")),
     person("Marianna", "Rottoli", email = "[email protected]", role = "aut"),
@@ -15,7 +15,7 @@ Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.3.1
 VignetteBuilder: knitr
-Date: 2024-04-03
+Date: 2024-04-05
 Config/testthat/edition: 3
 Imports:
     rmndt,
@@ -32,9 +32,7 @@ Imports:
     gdxrrw,
     gdxdt,
     remind2,
-    rlang,
-    yaml,
-    ymlthis
+    piamPlotComparison
 Suggests:
     testthat,
     knitr,

NAMESPACE

@@ -62,7 +62,6 @@ importFrom(quitte,as.quitte)
 importFrom(quitte,write.mif)
 importFrom(readxl,read_excel)
 importFrom(remind2,toolRegionSubsets)
-importFrom(rlang,parse_expr)
 importFrom(rmarkdown,render)
 importFrom(rmndt,aggregate_dt)
 importFrom(rmndt,approx_dt)
@@ -74,10 +73,5 @@ importFrom(rootSolve,multiroot)
 importFrom(stats,complete.cases)
 importFrom(stats,na.omit)
 importFrom(utils,read.csv)
-importFrom(yaml,yaml.load)
-importFrom(ymlthis,as_yml)
-importFrom(ymlthis,use_rmarkdown)
-importFrom(ymlthis,yml_params_code)
-importFrom(ymlthis,yml_replace)
 importFrom(zoo,na.approx)
 importFrom(zoo,na.spline)

README.md

@@ -1,6 +1,6 @@
 # Prepare EDGE Transport Data for the REMIND model
 
-R package **edgeTransport**, version **1.5.5**
+R package **edgeTransport**, version **1.5.6**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport)  [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds)
 
@@ -46,7 +46,7 @@ In case of questions / problems please contact Alois Dirnaichner <dirnaichner@pi
 
 To cite package **edgeTransport** in publications use:
 
-Dirnaichner A, Rottoli M, Hoppe J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 1.5.5, <https://github.com/pik-piam/edgeTransport>.
+Dirnaichner A, Rottoli M, Hoppe J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 1.5.6, <https://github.com/pik-piam/edgeTransport>.
 
 A BibTeX entry for LaTeX users is
 
@@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is
   title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model},
   author = {Alois Dirnaichner and Marianna Rottoli and Johanna Hoppe},
   year = {2024},
-  note = {R package version 1.5.5},
+  note = {R package version 1.5.6},
   url = {https://github.com/pik-piam/edgeTransport},
 }
 ```