Merge pull request #200 from OCHA-DAP/HDXDSYS-1093-global-population

HDXDSYS-1093 global population
OCHA-DAP · Nov 21, 2024 · f8419af · f8419af
2 parents 3c22d4a + cbe81e7
commit f8419af
Show file tree

Hide file tree

Showing 28 changed files with 62,660 additions and 3,383 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.10.21] - 2024-11-21
+
+### Changed
+
+- Updated population pipeline to read from global dataset
+
 ## [0.10.20] - 2024-11-20
 
 ### Changed

diff --git a/requirements.txt b/requirements.txt
@@ -156,9 +156,9 @@ pyasn1==0.6.1
     #   rsa
 pyasn1-modules==0.4.1
     # via google-auth
-pydantic==2.9.2
+pydantic==2.10.0
     # via frictionless
-pydantic-core==2.23.4
+pydantic-core==2.27.0
     # via pydantic
 pygments==2.18.0
     # via rich
@@ -228,7 +228,7 @@ ruamel-yaml==0.18.6
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
-setuptools==75.5.0
+setuptools==75.6.0
     # via ckanapi
 shellingham==1.5.4
     # via typer

diff --git a/src/hapi/pipelines/app/__main__.py b/src/hapi/pipelines/app/__main__.py
@@ -217,7 +217,6 @@ def main(
         "idps.yaml",
         "national_risk.yaml",
         "operational_presence.yaml",
-        "population.yaml",
         "refugees_and_returnees.yaml",
         "wfp.yaml",
     ]

diff --git a/src/hapi/pipelines/app/pipelines.py b/src/hapi/pipelines/app/pipelines.py
@@ -173,13 +173,6 @@ def _create_configurable_scrapers(
                 current_scrapers + scraper_names
             )
 
-        _create_configurable_scrapers("population", "national")
-        _create_configurable_scrapers(
-            "population", "adminone", adminlevel=self.adminone
-        )
-        _create_configurable_scrapers(
-            "population", "admintwo", adminlevel=self.admintwo
-        )
         _create_configurable_scrapers(
             "operational_presence", "admintwo", adminlevel=self.admintwo
         )
@@ -206,14 +199,12 @@ def run(self):
 
     def output_population(self):
         if not self.themes_to_run or "population" in self.themes_to_run:
-            results = self.runner.get_hapi_results(
-                self.configurable_scrapers["population"]
-            )
             population = Population(
                 session=self.session,
                 metadata=self.metadata,
                 admins=self.admins,
-                results=results,
+                configuration=self.configuration,
+                error_manager=self.error_manager,
             )
             population.populate()