🐛 ci/cd broken hmd grapher (#3677)

* 🐛 ci/cd broken hmd grapher * fix dimension error in jinja * typo * wip * wip * change version
owid · Dec 3, 2024 · 04467be · 04467be
1 parent bdf71c9
commit 04467be
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git 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/.../garden/hmd/2024-11-27/hmd.countries.json → .../garden/hmd/2024-12-01/hmd.countries.json b/.../garden/hmd/2024-11-27/hmd.countries.json → .../garden/hmd/2024-12-01/hmd.countries.json
diff --git a/...s/data/garden/hmd/2024-11-27/hmd.meta.yml → ...s/data/garden/hmd/2024-12-01/hmd.meta.yml b/...s/data/garden/hmd/2024-11-27/hmd.meta.yml → ...s/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 → etl/steps/data/garden/hmd/2024-12-01/hmd.py b/etl/steps/data/garden/hmd/2024-11-27/hmd.py → etl/steps/data/garden/hmd/2024-12-01/hmd.py
diff --git a/etl/steps/data/grapher/hmd/2024-11-27/hmd.py → etl/steps/data/grapher/hmd/2024-12-01/hmd.py b/etl/steps/data/grapher/hmd/2024-11-27/hmd.py → etl/steps/data/grapher/hmd/2024-12-01/hmd.py
diff --git a/etl/steps/data/meadow/hmd/2024-11-27/hmd.py → etl/steps/data/meadow/hmd/2024-12-01/hmd.py b/etl/steps/data/meadow/hmd/2024-11-27/hmd.py → etl/steps/data/meadow/hmd/2024-12-01/hmd.py