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.

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

📊 wid: Update World Inequality Database (Nov 2024 release) #3569

Draft
wants to merge 25 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
138293c
empty
paarriagadap Nov 19, 2024
e9376d3
:sparkles: update version
paarriagadap Nov 19, 2024
2d96c7b
:bug: fix dag
paarriagadap Nov 19, 2024
06dd2a9
:bug: fix staging_creation_time
Marigold Nov 19, 2024
30eef3c
Fix previous grapher version not showing in indicator upgrader
pabloarosado Nov 20, 2024
e6d4b10
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
Marigold Nov 21, 2024
cffb0c1
📊 education: EdStats (#3497)
veronikasamborska1994 Nov 21, 2024
a3be896
:hammer: Changes for compatibility with pandas 3.0 (#3550)
Marigold Nov 21, 2024
e6eda7b
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
paarriagadap Nov 21, 2024
4b867f0
:lipstick: modify tabulate code
paarriagadap Nov 22, 2024
f20f658
:bug: add title_public for share charts
paarriagadap Nov 25, 2024
c8cea56
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
paarriagadap Nov 25, 2024
b9e5902
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
paarriagadap Nov 26, 2024
0c60b9e
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
paarriagadap Jan 10, 2025
1b856dc
:lipstick: "living costs"
paarriagadap Jan 29, 2025
092463b
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
paarriagadap Feb 24, 2025
3627b33
make check
paarriagadap Feb 24, 2025
dea6150
:bug: fix dependences
paarriagadap Feb 24, 2025
9a9b820
empty
paarriagadap Feb 25, 2025
2047273
:sparkles: new version
paarriagadap Feb 25, 2025
8567208
empty
paarriagadap Feb 25, 2025
f49c6ea
:lipstick: change instruction
paarriagadap Feb 25, 2025
44c907e
Merge remote-tracking branch 'origin/master' into update-wid-nov-2024
paarriagadap Feb 25, 2025
a6ca64e
:bug: fix metadata for wealth
paarriagadap Mar 3, 2025
686b18c
:lisptick: delete etc
paarriagadap Mar 3, 2025
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 apps/utils/map_datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def get_grapher_changes(files_changed: Dict[str, Dict[str, str]], steps_df: pd.D
# Obtain old version
## This could happen with non-etl step files, like "shared.py". Ignore them
if len(candidate) == 0:
log.error("No candidate in steps_df was found! Working with old datasets (non-ETL)?")
log.error(f"No candidate in steps_df was found for: {file_path}")
## Unknown error.
elif len(candidate) > 1:
log.error(f"Could not identify a step matching file {file_path}")
Expand Down
1 change: 1 addition & 0 deletions dag/archive/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ include:
- dag/archive/fasttrack.yml
- dag/archive/climate.yml
- dag/archive/environment.yml
- dag/archive/poverty_inequality.yml
- dag/archive/equality.yml
- dag/archive/plastic_use.yml
- dag/archive/artificial_intelligence.yml
Expand Down
15 changes: 13 additions & 2 deletions dag/archive/poverty_inequality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ steps:
- data://meadow/lis/2023-08-30/luxembourg_income_study
data://grapher/lis/2023-08-30/luxembourg_income_study:
- data://garden/lis/2023-08-30/luxembourg_income_study
data://explorers/lis/latest/luxembourg_income_study:
- data://garden/lis/2023-08-30/luxembourg_income_study

data://meadow/lis/2024-06-13/luxembourg_income_study:
- snapshot://lis/2024-06-13/lis_keyvars.csv
Expand Down Expand Up @@ -57,6 +55,19 @@ steps:
data://grapher/ophi/2023-07-05/multidimensional_poverty_index:
- data://garden/ophi/2023-07-05/multidimensional_poverty_index

# World Inequality Database
data://meadow/wid/2024-05-24/world_inequality_database:
- data://garden/regions/2023-01-01/regions
- snapshot://wid/2024-05-24/world_inequality_database.csv
- snapshot://wid/2024-05-24/world_inequality_database_with_extrapolations.csv
- snapshot://wid/2024-05-24/world_inequality_database_distribution.csv
- snapshot://wid/2024-05-24/world_inequality_database_distribution_with_extrapolations.csv
- snapshot://wid/2024-05-24/world_inequality_database_fiscal.csv
data://garden/wid/2024-05-24/world_inequality_database:
- data://meadow/wid/2024-05-24/world_inequality_database
data://grapher/wid/2024-05-24/world_inequality_database:
- data://garden/wid/2024-05-24/world_inequality_database

# Poverty projections from the World Bank
data://meadow/wb/2024-06-26/poverty_projections:
- snapshot://wb/2024-06-26/poverty_projections_number_global.csv
Expand Down
26 changes: 13 additions & 13 deletions dag/poverty_inequality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ steps:
- data://garden/wb/2024-10-07/world_bank_pip

# World Inequality Database
data://meadow/wid/2024-05-24/world_inequality_database:
data://meadow/wid/2025-02-25/world_inequality_database:
- snapshot://wid/2025-02-25/world_inequality_database_with_extrapolations.csv
- snapshot://wid/2025-02-25/world_inequality_database_distribution.csv
- snapshot://wid/2025-02-25/world_inequality_database_distribution_with_extrapolations.csv
- snapshot://wid/2025-02-25/world_inequality_database.csv
- snapshot://wid/2025-02-25/world_inequality_database_fiscal.csv
- data://garden/regions/2023-01-01/regions
- snapshot://wid/2024-05-24/world_inequality_database.csv
- snapshot://wid/2024-05-24/world_inequality_database_with_extrapolations.csv
- snapshot://wid/2024-05-24/world_inequality_database_distribution.csv
- snapshot://wid/2024-05-24/world_inequality_database_distribution_with_extrapolations.csv
- snapshot://wid/2024-05-24/world_inequality_database_fiscal.csv
data://garden/wid/2024-05-24/world_inequality_database:
- data://meadow/wid/2024-05-24/world_inequality_database
data://grapher/wid/2024-05-24/world_inequality_database:
- data://garden/wid/2024-05-24/world_inequality_database
data://garden/wid/2025-02-25/world_inequality_database:
- data://meadow/wid/2025-02-25/world_inequality_database
data://grapher/wid/2025-02-25/world_inequality_database:
- data://garden/wid/2025-02-25/world_inequality_database
data://explorers/wid/latest/world_inequality_database:
- data://garden/wid/2024-05-24/world_inequality_database
- data://garden/wid/2025-02-25/world_inequality_database

# Luxembourg Income Study
data://meadow/lis/2025-01-24/luxembourg_income_study:
Expand All @@ -55,7 +55,7 @@ steps:
# Poverty and inequality file for inequality comparisons at OWID
data://garden/poverty_inequality/2025-01-22/poverty_inequality_file:
- data://garden/wb/2024-10-07/world_bank_pip
- data://garden/wid/2024-05-24/world_inequality_database
- data://garden/wid/2025-02-25/world_inequality_database
- data://garden/lis/2025-01-24/luxembourg_income_study
- data://garden/wb/2024-01-22/thousand_bins_distribution
- data://garden/worldbank_wdi/2024-05-20/wdi
Expand All @@ -66,7 +66,7 @@ steps:
- data://garden/demography/2023-03-31/population
- data://garden/regions/2023-01-01/regions
- data://garden/wb/2024-10-07/world_bank_pip
- data://garden/wid/2024-05-24/world_inequality_database
- data://garden/wid/2025-02-25/world_inequality_database
- data://garden/lis/2025-01-24/luxembourg_income_study
data://grapher/poverty_inequality/2025-01-22/inequality_comparison:
- data://garden/poverty_inequality/2025-01-22/inequality_comparison
Expand Down
Loading