Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enhance country2iso dictionary (used to read in data from Global Ener… #187

Merged
merged 1 commit into from
Oct 17, 2023
Merged

enhance country2iso dictionary (used to read in data from Global Ener… #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '7249374'
ValidationKey: '70925670'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
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: 'madrat: May All Data be Reproducible and Transparent (MADRaT) *'
version: 3.6.9
date-released: '2023-10-16'
version: 3.6.10
date-released: '2023-10-17'
abstract: Provides a framework which should improve reproducibility and transparency
in data processing. It provides functionality such as automatic meta data creation
and management, rudimentary quality management, data caching, work-flow management
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: madrat
Title: May All Data be Reproducible and Transparent (MADRaT) *
Version: 3.6.9
Date: 2023-10-16
Version: 3.6.10
Date: 2023-10-17
Authors@R: c(
person("Jan Philipp", "Dietrich", , "[email protected]", role = c("aut", "cre")),
person("Lavinia", "Baumstark", , "[email protected]", role = "aut"),
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# May All Data be Reproducible and Transparent (MADRaT) *

R package **madrat**, version **3.6.9**
R package **madrat**, version **3.6.10**

[![CRAN status](https://www.r-pkg.org/badges/version/madrat)](https://cran.r-project.org/package=madrat) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1115490.svg)](https://doi.org/10.5281/zenodo.1115490) [![R build status](https://github.com/pik-piam/madrat/workflows/check/badge.svg)](https://github.com/pik-piam/madrat/actions) [![codecov](https://codecov.io/gh/pik-piam/madrat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/madrat) [![r-universe](https://pik-piam.r-universe.dev/badges/madrat)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -55,7 +55,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi

To cite package **madrat** in publications use:

Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.6.9, <https://github.com/pik-piam/madrat>.
Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.6.10, <https://github.com/pik-piam/madrat>.

A BibTeX entry for LaTeX users is

Expand All @@ -64,7 +64,7 @@ A BibTeX entry for LaTeX users is
title = {madrat: May All Data be Reproducible and Transparent (MADRaT)},
author = {Jan Philipp Dietrich and Lavinia Baumstark and Stephen Wirth and Anastasis Giannousakis and Renato Rodrigues and Benjamin Leon Bodirsky and Debbora Leip and Ulrich Kreidenweis and David Klein and Pascal Sauer},
year = {2023},
note = {R package version 3.6.9},
note = {R package version 3.6.10},
doi = {10.5281/zenodo.1115490},
url = {https://github.com/pik-piam/madrat},
}
Expand Down
6 changes: 6 additions & 0 deletions inst/extdata/country2iso.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ agypten;EGY
AI;AIA
AL;ALB
Aland Islands;ALA
Åland Islands;ALA
Albania;ALB
albanien;ALB
Algeria;DZA
Expand Down Expand Up @@ -231,6 +232,7 @@ Dominican Republic;DOM
Dominican_Republic;DOM
DOMINICANR;DOM
Dominika,Rep,;DOM
DR Congo;COD
DZ;DZA
east & west pakistan;XXX
East Timor;TLS
Expand Down Expand Up @@ -690,6 +692,7 @@ Republic of North Macedonia;MKD
republic of south sudan;SSD
republic of south vietnam;XXX
republic of sudan;XXX
Republic of the Congo;COG
Reunion;REU
Réunion;REU
rhodesia-nyasaland;XXX
Expand Down Expand Up @@ -853,6 +856,7 @@ TH;THA
Thailand;THA
The former Yugoslav Rep. of Macedonia;MKD
The former Yugoslav Republic of Macedonia;MKD
The Gambia;GMB
Timor Leste;TLS
Timor-Leste;TLS
timor-leste (formerly east timor);TLS
Expand Down Expand Up @@ -944,6 +948,7 @@ Virgin Islands, British;VGB
Virgin Islands, U.S.;VIR
Virgin Islands, US;VIR
Virgin_Islands;VIR
Virgin Islands (U_S_);VIR
VN;VNM
Volkrep,China;CHN
VU;VUT
Expand Down Expand Up @@ -980,3 +985,4 @@ Zimbabwe;ZWE
ZM;ZMB
ZW;ZWE
zypern;CYP