Merge pull request #54 from OCHA-DAP/main

Upgrade requirements and rename endpoints

.config/pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.6
     hooks:
       # Run the linter.
       - id: ruff
@@ -17,7 +17,7 @@ repos:
       - id: ruff-format
         args: [--config, .config/ruff.toml]
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.5.15
+    rev: 0.6.1
     hooks:
       # Run the pip compile
       - id: pip-compile

CHANGELOG.md

@@ -4,6 +4,30 @@ 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.40] = 2025-02-20
+
+### Changed
+
+- Humanitarian needs reads from HAPI dataset
+
+## [0.10.39] = 2025-02-18
+
+### Changed
+
+- TD -> TCD due to changes in global p-codes
+
+## [0.10.38] = 2025-02-11
+
+### Changed
+
+- Operational presence reads from HAPI dataset
+
+## [0.10.37] = 2025-02-10
+
+### Changed
+
+- Upgrade requirements to incorporate schema changes and fixes
+
 ## [0.10.36] = 2025-01-30
 
 ### Changed

pyproject.toml

@@ -34,12 +34,12 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "hapi-schema>= 0.9.6",
-    "hdx-python-api>= 6.3.7",
-    "hdx-python-country>= 3.8.7",
-    "hdx-python-database[postgresql]>= 1.3.4",
-    "hdx-python-scraper>= 2.5.5",
-    "hdx-python-utilities>= 3.8.3",
+    "hapi-schema>= 0.9.8",
+    "hdx-python-api>= 6.3.8",
+    "hdx-python-country>= 3.8.8",
+    "hdx-python-database[postgresql]>= 1.3.5",
+    "hdx-python-scraper>= 2.6.3",
+    "hdx-python-utilities>= 3.8.4",
     "libhxl",
     "sqlalchemy"
 ]
@@ -97,7 +97,7 @@ run = """
        """
 
 [tool.hatch.envs.hatch-static-analysis]
-dependencies = ["ruff==0.8.6"]
+dependencies = ["ruff==0.9.6"]
 
 [tool.hatch.envs.hatch-static-analysis.scripts]
 format-check = ["ruff format --config .config/ruff.toml --check --diff {args:.}",]

requirements.txt

@@ -10,7 +10,7 @@ attrs==25.1.0
     #   referencing
 cachetools==5.5.1
     # via google-auth
-certifi==2024.12.14
+certifi==2025.1.31
     # via requests
 cfgv==3.4.0
     # via pre-commit
@@ -22,7 +22,7 @@ ckanapi==4.8
     # via hdx-python-api
 click==8.1.8
     # via typer
-coverage==7.6.10
+coverage==7.6.12
     # via pytest-cov
 defopt==6.4.0
     # via hdx-python-api
@@ -54,30 +54,30 @@ greenlet==3.1.1
     # via sqlalchemy
 gspread==6.1.4
     # via hdx-python-scraper
-hapi-schema==0.9.6
+hapi-schema==0.9.8
     # via hapi-pipelines (pyproject.toml)
-hdx-python-api==6.3.7
+hdx-python-api==6.3.8
     # via
     #   hapi-pipelines (pyproject.toml)
     #   hdx-python-scraper
-hdx-python-country==3.8.7
+hdx-python-country==3.8.8
     # via
     #   hapi-pipelines (pyproject.toml)
     #   hdx-python-api
     #   hdx-python-scraper
-hdx-python-database==1.3.4
+hdx-python-database==1.3.5
     # via hapi-pipelines (pyproject.toml)
-hdx-python-scraper==2.5.5
+hdx-python-scraper==2.6.3
     # via hapi-pipelines (pyproject.toml)
-hdx-python-utilities==3.8.3
+hdx-python-utilities==3.8.4
     # via
     #   hapi-pipelines (pyproject.toml)
     #   hdx-python-api
     #   hdx-python-country
     #   hdx-python-scraper
-humanize==4.11.0
+humanize==4.12.1
     # via frictionless
-identify==2.6.6
+identify==2.6.7
     # via pre-commit
 idna==3.10
     # via
@@ -170,7 +170,7 @@ pytest==8.3.4
     #   pytest-check
     #   pytest-cov
     #   pytest-mock
-pytest-check==2.4.1
+pytest-check==2.5.0
     # via hapi-pipelines (pyproject.toml)
 pytest-cov==6.0.0
     # via hapi-pipelines (pyproject.toml)
@@ -234,7 +234,7 @@ shellingham==1.5.4
     # via typer
 simpleeval==1.0.3
     # via frictionless
-simplejson==3.19.3
+simplejson==3.20.1
     # via ckanapi
 six==1.17.0
     # via
@@ -244,7 +244,7 @@ six==1.17.0
     #   sphinxcontrib-napoleon
 sphinxcontrib-napoleon==0.7
     # via defopt
-sqlalchemy==2.0.37
+sqlalchemy==2.0.38
     # via
     #   hapi-pipelines (pyproject.toml)
     #   hapi-schema
@@ -261,7 +261,7 @@ tenacity==9.0.0
     # via hdx-python-country
 text-unidecode==1.3
     # via python-slugify
-typeguard==4.4.1
+typeguard==4.4.2
     # via inflect
 typer==0.15.1
     # via frictionless
@@ -285,7 +285,7 @@ urllib3==2.3.0
     #   requests
 validators==0.34.0
     # via frictionless
-virtualenv==20.29.1
+virtualenv==20.29.2
     # via pre-commit
 wheel==0.45.1
     # via libhxl

src/hapi/pipelines/app/pipelines.py

@@ -241,6 +241,7 @@ def output_humanitarian_needs(self):
                 metadata=self._metadata,
                 admins=self._admins,
                 configuration=self._configuration,
+                error_handler=self._error_handler,
             )
             humanitarian_needs.populate()
 

src/hapi/pipelines/configs/core.yaml

@@ -72,7 +72,7 @@ admin1:
     "SOM|Juba Hoose": "SO28"
     "SOM|Shabelle Dhexe": "SO21"
     "SOM|Shabelle Hoose": "SO23"
-    "TCD|Mayo Kebbi Ouest": "TD12"
+    "TCD|Mayo Kebbi Ouest": "TCD12"
     "UKR|Avtonomna Respublika Krym": "UA01"
     "UKR|Kyivska": "UA80"
     "YEM|Amanat Al Asimah": "YE13"
@@ -156,9 +156,9 @@ admin2:
     "SD12|Al Gedaref Rural": "SD12080"
     "SD15|Wad Madani El Kobra": "SD15030"
     "SD18|El Salam": "SD18086"
-    "TD11|La kabbia": "TD1102"
-    "TD17|Iriba": "TD1703"
-    "TD22|Tibest-Ouest": "TD2202"
+    "TCD11|La kabbia": "TCD1102"
+    "TCD17|Iriba": "TCD1703"
+    "TCD22|Tibest-Ouest": "TCD2202"
     "TG05|Kpendial- Ouest": "TG0513"
     "TZ12|Mbozi": "TZ2606"  # TODO: this unit is not getting picked up because of the mismatched admin1
     "UA12|Apostolivskyi": "UA1206"