Skip to content

Commit

Permalink
Merge pull request #89 from johanneskoch94/INDhg
Browse files Browse the repository at this point in the history
Refactor and change default scenarios
  • Loading branch information
johanneskoch94 authored Nov 6, 2024
2 parents dfacdf3 + 16809dc commit 5ef20f4
Show file tree
Hide file tree
Showing 99 changed files with 1,902 additions and 2,682 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '6069696'
ValidationKey: '8013200'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'mrdrivers: Create GDP and Population Scenarios'
version: 3.0.3
date-released: '2024-11-05'
version: 4.0.0
date-released: '2024-11-06'
abstract: Create GDP and population scenarios This package constructs the GDP and
population scenarios used as drivers in both the REMIND and MAgPIE models.
authors:
Expand Down
14 changes: 5 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: mrdrivers
Type: Package
Title: Create GDP and Population Scenarios
Version: 3.0.3
Version: 4.0.0
Authors@R: c(person(given = "Johannes",
family = "Koch",
email = "[email protected]",
Expand All @@ -22,7 +22,6 @@ Depends:
Imports:
countrycode,
dplyr,
lifecycle,
glue,
magrittr,
purrr,
Expand All @@ -31,23 +30,20 @@ Imports:
rlang,
tibble,
tidyr,
tidyselect,
zoo
tidyselect
Suggests:
covr,
crayon,
eurostat,
kableExtra,
knitr,
pander,
rmarkdown,
testthat (>= 3.0.0),
WDI,
withr (>= 2.4.2),
yaml
yaml,
zoo
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
Date: 2024-11-05
Date: 2024-11-06
Config/testthat/edition: 3
VignetteBuilder: knitr
4 changes: 3 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Generated by roxygen2: do not edit by hand

export(toolGeneralConvert)
export(toolGetScenarioDefinition)
export(toolGetUnitDollar)
export(toolHarmonizeFuture)
export(toolHarmonizePast)
exportPattern("^((calc(GDP|GDPpc|Population|Labour|Urban)(Past|Future|$))|read|download)")
import(GDPuc)
import(madrat)
import(magclass)
importFrom(glue,glue)
importFrom(lifecycle,deprecate_soft)
importFrom(magrittr,"%>%")
importFrom(rlang,.data)
Loading

0 comments on commit 5ef20f4

Please sign in to comment.