From 04467be7aa14966ad61a8e6c5230998d0a07f731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Rod=C3=A9s-Guirao?= Date: Tue, 3 Dec 2024 01:20:16 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20ci/cd=20broken=20hmd=20grapher?= =?UTF-8?q?=20(#3677)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 ci/cd broken hmd grapher * fix dimension error in jinja * typo * wip * wip * change version --- dag/demography.yml | 12 +++++----- .../hmd.countries.json | 0 .../{2024-11-27 => 2024-12-01}/hmd.meta.yml | 23 +++++++++++++------ .../hmd/{2024-11-27 => 2024-12-01}/hmd.py | 0 .../hmd/{2024-11-27 => 2024-12-01}/hmd.py | 0 .../hmd/{2024-11-27 => 2024-12-01}/hmd.py | 0 6 files changed, 22 insertions(+), 13 deletions(-) rename etl/steps/data/garden/hmd/{2024-11-27 => 2024-12-01}/hmd.countries.json (100%) rename etl/steps/data/garden/hmd/{2024-11-27 => 2024-12-01}/hmd.meta.yml (96%) rename etl/steps/data/garden/hmd/{2024-11-27 => 2024-12-01}/hmd.py (100%) rename etl/steps/data/grapher/hmd/{2024-11-27 => 2024-12-01}/hmd.py (100%) rename etl/steps/data/meadow/hmd/{2024-11-27 => 2024-12-01}/hmd.py (100%) diff --git a/dag/demography.yml b/dag/demography.yml index cdd5e679957..7094e2980d9 100644 --- a/dag/demography.yml +++ b/dag/demography.yml @@ -124,12 +124,12 @@ steps: - data://garden/hmd/2023-09-19/hmd # Human Mortality Database - data://meadow/hmd/2024-11-27/hmd: + data://meadow/hmd/2024-12-01/hmd: - snapshot://hmd/2024-11-27/hmd.zip - data://garden/hmd/2024-11-27/hmd: - - data://meadow/hmd/2024-11-27/hmd - data://grapher/hmd/2024-11-27/hmd: - - data://garden/hmd/2024-11-27/hmd + data://garden/hmd/2024-12-01/hmd: + - data://meadow/hmd/2024-12-01/hmd + data://grapher/hmd/2024-12-01/hmd: + - data://garden/hmd/2024-12-01/hmd # Gini Life Expectancy Inequality data://garden/demography/2023-10-04/gini_le: @@ -250,6 +250,6 @@ steps: # Survivorship ages (HMD-derived) data://garden/demography/2024-12-02/survivor_percentiles: - - data://garden/hmd/2024-11-27/hmd + - data://garden/hmd/2024-12-01/hmd data://grapher/demography/2024-12-02/survivor_percentiles: - data://garden/demography/2024-12-02/survivor_percentiles diff --git a/etl/steps/data/garden/hmd/2024-11-27/hmd.countries.json b/etl/steps/data/garden/hmd/2024-12-01/hmd.countries.json similarity index 100% rename from etl/steps/data/garden/hmd/2024-11-27/hmd.countries.json rename to etl/steps/data/garden/hmd/2024-12-01/hmd.countries.json diff --git a/etl/steps/data/garden/hmd/2024-11-27/hmd.meta.yml b/etl/steps/data/garden/hmd/2024-12-01/hmd.meta.yml similarity index 96% rename from etl/steps/data/garden/hmd/2024-11-27/hmd.meta.yml rename to etl/steps/data/garden/hmd/2024-12-01/hmd.meta.yml index 0cd4ff29340..28488c2dc7b 100644 --- a/etl/steps/data/garden/hmd/2024-11-27/hmd.meta.yml +++ b/etl/steps/data/garden/hmd/2024-12-01/hmd.meta.yml @@ -241,7 +241,7 @@ tables: <%- endif %> display: name: |- - {tables.deaths.variables.deaths.title} {definitions.others.display_name_dim} + {tables.deaths.variables.deaths.title} at << 'birth' if (age == '0') else age >><< ', ' + sex + 's' if (sex != 'total') >> presentation: title_public: |- {tables.deaths.variables.deaths.title} {definitions.others.title_public_dim} @@ -269,7 +269,7 @@ tables: We have used the "19xx+" population estimates for the year of the territorial change. display: name: |- - {tables.population.variables.population.title} {definitions.others.display_name_dim} + {tables.population.variables.population.title} aged << age >><< ', ' + sex + 's' if (sex != 'total') >> presentation: title_public: |- {tables.population.variables.population.title} {definitions.others.title_public_dim} @@ -293,11 +293,15 @@ tables: <%- endif %> display: name: |- - {tables.births.variables.births.title} {definitions.others.display_name_dim} + Births, sex: << sex >> presentation: title_public: |- - {tables.births.variables.births.title} {definitions.others.title_public_dim} - + {tables.births.variables.births.title}, + <%- if sex == 'total' %> + total + <%- else %> + << sex >>s + <%- endif %> birth_rate: title: Birth rate unit: births per 1,000 people @@ -309,10 +313,15 @@ tables: <%- endif %> display: name: |- - {tables.births.variables.births.title} {definitions.others.display_name_dim} + Birth rate, sex: << sex >> presentation: title_public: |- - {tables.births.variables.births.title} {definitions.others.title_public_dim} + {tables.births.variables.birth_rate.title}, + <%- if sex == 'total' %> + total + <%- else %> + << sex >>s + <%- endif %> diff_ratios: common: diff --git a/etl/steps/data/garden/hmd/2024-11-27/hmd.py b/etl/steps/data/garden/hmd/2024-12-01/hmd.py similarity index 100% rename from etl/steps/data/garden/hmd/2024-11-27/hmd.py rename to etl/steps/data/garden/hmd/2024-12-01/hmd.py diff --git a/etl/steps/data/grapher/hmd/2024-11-27/hmd.py b/etl/steps/data/grapher/hmd/2024-12-01/hmd.py similarity index 100% rename from etl/steps/data/grapher/hmd/2024-11-27/hmd.py rename to etl/steps/data/grapher/hmd/2024-12-01/hmd.py diff --git a/etl/steps/data/meadow/hmd/2024-11-27/hmd.py b/etl/steps/data/meadow/hmd/2024-12-01/hmd.py similarity index 100% rename from etl/steps/data/meadow/hmd/2024-11-27/hmd.py rename to etl/steps/data/meadow/hmd/2024-12-01/hmd.py