Merge pull request #30 from OCHA-DAP/main

Fix TCD population (again)
OCHA-DAP · Sep 18, 2024 · f0a0f5c · f0a0f5c
2 parents 6fca18a + 8dd2e14
commit f0a0f5c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.9.58] - 2024-09-18
+
+### Fixed
+
+- Fix for TCD population dataset change (again)
+
 ## [0.9.57] - 2024-09-17
 
 ### Added
@@ -14,7 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 
-- Fix for TCD population dataset change 
+- Fix for TCD population dataset change
 
 ## [0.9.55] - 2024-09-17
 

diff --git a/requirements.txt b/requirements.txt
@@ -40,7 +40,7 @@ email-validator==2.2.0
     # via hdx-python-api
 et-xmlfile==1.1.0
     # via openpyxl
-filelock==3.16.0
+filelock==3.16.1
     # via virtualenv
 frictionless==5.17.1
     # via hdx-python-utilities
@@ -134,7 +134,7 @@ packaging==24.1
     # via pytest
 petl==1.7.15
     # via frictionless
-platformdirs==4.3.3
+platformdirs==4.3.6
     # via virtualenv
 pluggy==1.5.0
     # via pytest
@@ -156,9 +156,9 @@ pyasn1==0.6.1
     #   rsa
 pyasn1-modules==0.4.1
     # via google-auth
-pydantic==2.9.1
+pydantic==2.9.2
     # via frictionless
-pydantic-core==2.23.3
+pydantic-core==2.23.4
     # via pydantic
 pygments==2.18.0
     # via rich
@@ -283,7 +283,7 @@ urllib3==2.2.3
     #   requests
 validators==0.34.0
     # via frictionless
-virtualenv==20.26.4
+virtualenv==20.26.5
     # via pre-commit
 wheel==0.44.0
     # via libhxl

diff --git a/src/hapi/pipelines/configs/population.yaml b/src/hapi/pipelines/configs/population.yaml
@@ -945,8 +945,9 @@ population_national:
 
   population_tcd:
     dataset: "cod-ps-tcd"
-    resource: "tcd_admpop_adm0_2023.csv"
-    format: "csv"
+    resource: "tcd_admpop_2023.xlsx"
+    format: "xlsx"
+    sheet: "tcd_admpop_adm0_2023"
     use_hxl: False
     admin_single: "TCD"
     input:
@@ -1913,9 +1914,9 @@ population_adminone:
 
   population_tcd:
     dataset: "cod-ps-tcd"
-    resource: "tcd_adm1_pop_2023.xlsx"
+    resource: "tcd_admpop_2023.xlsx"
     format: "xlsx"
-    sheet: "TCD_ADM1_POP_2023"
+    sheet: "tcd_admpop_adm1_2023"
     use_hxl: False
     admin:
       - ~

diff --git a/tests/fixtures/input/cod-ps-tcd.json b/tests/fixtures/input/cod-ps-tcd.json
diff --git a/tests/fixtures/input/population_tcd_tcd_adm1_pop_2023.xlsx b/tests/fixtures/input/population_tcd_tcd_adm1_pop_2023.xlsx
diff --git a/tests/fixtures/input/population_tcd_tcd_admpop_2023.xlsx b/tests/fixtures/input/population_tcd_tcd_admpop_2023.xlsx
diff --git a/tests/fixtures/input/population_tcd_tcd_admpop_adm0_2023.csv b/tests/fixtures/input/population_tcd_tcd_admpop_adm0_2023.csv
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -131,11 +131,11 @@ def test_population(self, configuration, folder, pipelines):
         count = session.scalar(select(func.count(DBDataset.hdx_id)))
         check.equal(count, 5)
         count = session.scalar(select(func.count(DBResource.hdx_id)))
-        check.equal(count, 12)
+        check.equal(count, 11)
         count = session.scalar(
             select(func.count(DBPopulation.resource_hdx_id))
         )
-        check.equal(count, 7359)
+        check.equal(count, 8601)
 
     @pytest.mark.parametrize(
         "themes_to_run", [{"operational_presence": ("AFG", "MLI", "NGA")}]