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

Add regions to gcp gcb #66

Merged
merged 8 commits into from
Apr 18, 2022
Merged

Add regions to gcp gcb #66

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ceafda
fix(gcp_gcb): fix bug and update old variable ids
pabloarosado Apr 13, 2022
47fdf77
data(gcp_gcb): update country mappings and region mappings
pabloarosado Apr 13, 2022
92d5091
fix(gcp_gcb): fix incorrect country mapping
pabloarosado Apr 14, 2022
6bb706a
data(gcp_gcb): update GCP version
pabloarosado Apr 14, 2022
4e2124d
data(gcp_gcb): update GCP dataset outputs
pabloarosado Apr 14, 2022
96c34c9
data(gcp_gcb): update year tag
pabloarosado Apr 14, 2022
484c253
data(gcp_gcb): update outputs after changing year tag
pabloarosado Apr 14, 2022
1712cb8
data(gcp_gcb): update variable replacement mapping for GCP
pabloarosado Apr 18, 2022
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
4 changes: 2 additions & 2 deletions gcp_gcb/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# Dataset constants.
DATASET_NAME = "Global Carbon Budget"
DATASET_AUTHORS = "Global Carbon Project"
DATASET_VERSION = "2021"
DATASET_VERSION = "v2021"
DATASET_LINK = "https://doi.org/10.18160/gcp-2021"
DATASET_RETRIEVED_DATE = "4-November-2021"
DATASET_RETRIEVED_DATE = "14-April-2022"
DATASET_DIR = os.path.dirname(__file__).split("/")[-1]
DATASET_NAMESPACE = f"{DATASET_DIR}@{DATASET_VERSION}"
CONFIGPATH = os.path.join(DATASET_DIR, "config")
Expand Down
10 changes: 5 additions & 5 deletions gcp_gcb/clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ def _construct_source(
),
),
"derived_gdp": _construct_source(
name=f"Our World in Data based on the {DATASET_AUTHORS} and {gdp_source['s_name']}",
dataPublishedBy=f"Our World in Data based on the {DATASET_AUTHORS} and {gdp_source['s_name']}",
dataPublisherSource=f"{default_data_publisher_source} and {gdp_source['s_name']}",
name=f"Our World in Data based on the {DATASET_AUTHORS} and {gdp_source['source']['name']}",
dataPublishedBy=f"Our World in Data based on the {DATASET_AUTHORS} and {gdp_source['source']['name']}",
dataPublisherSource=f"{default_data_publisher_source} and {gdp_source['source']['name']}",
appendAdditionalInfo=(
f"\n\nGDP figures are sourced from "
f"{gdp_source['source']['dataPublishedBy']} "
Expand Down Expand Up @@ -530,12 +530,12 @@ def population_id(self) -> int:
@property
def gdp_id(self) -> int:
"""OWID variable ID for the latest Maddison GDP series"""
return 146201
return 417484

@property
def primary_energy_id(self) -> int:
"""OWID variable ID for the latest primary energy consumption series"""
return 143360
return 413912

@property
def variables_to_drop(self) -> List[str]:
Expand Down
Loading