Update conflict tests

OCHA-DAP · Feb 14, 2025 · 71fbfe0 · 71fbfe0
1 parent 7fbfd83
commit 71fbfe0
Show file tree

Hide file tree

Showing 16 changed files with 172,984 additions and 508 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -56,7 +56,7 @@ gspread==6.1.4
     # via hdx-python-scraper
 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
@@ -67,15 +67,15 @@ hdx-python-country==3.8.8
     #   hdx-python-scraper
 hdx-python-database==1.3.5
     # via hapi-pipelines (pyproject.toml)
-hdx-python-scraper==2.5.9
+hdx-python-scraper==2.6.0
     # via hapi-pipelines (pyproject.toml)
 hdx-python-utilities==3.8.3
     # via
     #   hapi-pipelines (pyproject.toml)
     #   hdx-python-api
     #   hdx-python-country
     #   hdx-python-scraper
-humanize==4.11.0
+humanize==4.12.0
     # via frictionless
 identify==2.6.7
     # via pre-commit

diff --git a/tests/fixtures/input/3e6bfc98-f837-495d-b8de-71e5ac026f59.json b/tests/fixtures/input/3e6bfc98-f837-495d-b8de-71e5ac026f59.json
diff --git a/tests/fixtures/input/921fe117-7158-437b-943d-94969d545362.json b/tests/fixtures/input/921fe117-7158-437b-943d-94969d545362.json
diff --git a/tests/fixtures/input/burkina-faso-acled-conflict-data.json b/tests/fixtures/input/burkina-faso-acled-conflict-data.json
diff --git a/tests/fixtures/input/c946742e-cf48-4d8f-8338-4f030768ca14.json b/tests/fixtures/input/c946742e-cf48-4d8f-8338-4f030768ca14.json
diff --git a/tests/fixtures/input/colombia-acled-conflict-data.json b/tests/fixtures/input/colombia-acled-conflict-data.json
diff --git a/...an_targeting_burkina_faso_hrp_civilian_targeting_events_and_fatalities_by_month_year.xlsx b/...an_targeting_burkina_faso_hrp_civilian_targeting_events_and_fatalities_by_month_year.xlsx
diff --git a/...conflict_event_bfa_demonstration_burkina_faso_hrp_demonstration_events_by_month_year.xlsx b/...conflict_event_bfa_demonstration_burkina_faso_hrp_demonstration_events_by_month_year.xlsx
diff --git a/...cal_violence_burkina_faso_hrp_political_violence_events_and_fatalities_by_month_year.xlsx b/...cal_violence_burkina_faso_hrp_political_violence_events_and_fatalities_by_month_year.xlsx
diff --git a/...vilian_targeting_colombia_hrp_civilian_targeting_events_and_fatalities_by_month_year.xlsx b/...vilian_targeting_colombia_hrp_civilian_targeting_events_and_fatalities_by_month_year.xlsx
diff --git a/...put/conflict_event_col_demonstration_colombia_hrp_demonstration_events_by_month_year.xlsx b/...put/conflict_event_col_demonstration_colombia_hrp_demonstration_events_by_month_year.xlsx
diff --git a/...litical_violence_colombia_hrp_political_violence_events_and_fatalities_by_month_year.xlsx b/...litical_violence_colombia_hrp_political_violence_events_and_fatalities_by_month_year.xlsx
diff --git a/tests/fixtures/input/download-hdx-hapi-conflict-event-global-2024.csv b/tests/fixtures/input/download-hdx-hapi-conflict-event-global-2024.csv
diff --git a/...-hapi-conflict-event-global-2025-2029.csv → ...d-hdx-hapi-conflict-event-global-2025.csv b/...-hapi-conflict-event-global-2025-2029.csv → ...d-hdx-hapi-conflict-event-global-2025.csv
diff --git a/tests/fixtures/input/hdx-hapi-conflict-event.json b/tests/fixtures/input/hdx-hapi-conflict-event.json
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -363,7 +363,7 @@ def test_conflict_event(self, configuration, folder, pipelines):
         count = session.scalar(
             select(func.count(DBConflictEvent.resource_hdx_id))
         )
-        check.equal(count, 28740)
+        check.equal(count, 201180)
 
     @pytest.mark.parametrize("themes_to_run", [{"poverty_rate": None}])
     def test_poverty_rate(self, configuration, folder, pipelines):