From 314fd192b1e570c739b7fc846aeb61676ffccfbc Mon Sep 17 00:00:00 2001 From: Michael Dales Date: Thu, 8 May 2025 13:54:20 +0100 Subject: [PATCH 1/2] Add threat stages to run.sh --- scripts/run.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/run.sh b/scripts/run.sh index 6bd7b79..7234ace 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -74,3 +74,10 @@ python3 ./aoh-calculator/validation/collate_data.py --aoh_results ${DATADIR}/aoh --output ${DATADIR}/validation/aohs.csv python3 ./aoh-calculator/validation/validate_map_prevalence.py --collated_aoh_data ${DATADIR}/validation/aohs.csv \ --output ${DATADIR}/validation/model_validation.csv + +# Threats +python3 ./utils/threats_generator.py --input ${DATADIR}/species-info --datadir ${DATADIR} --output ${DATADIR}/threatbatch.csv + +littlejohn -j 200 -o ${DATADIR}/threatbatch.log -c ${DATADIR}/threatcatch.csv ${VIRTUAL_ENV}/bin/python3 -- ./threats/threat_processing.py + +python3 ./threats/threat_summation.py --threat_rasters ${DATADIR}/threat_rasters --output ${DATADIR}/threat_results From bce370b6f6438c4c6434446e76d965a6a74aa26b Mon Sep 17 00:00:00 2001 From: Michael Dales Date: Thu, 8 May 2025 13:58:44 +0100 Subject: [PATCH 2/2] update aoh-calculator/yirgacheffe --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c84786c..8f1b0d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ gdal[numpy] git+https://github.com/quantifyearth/iucn_modlib git+https://github.com/quantifyearth/pyshark -git+https://github.com/quantifyearth/yirgacheffe@ff78ca4c51609ee0750d5c62d38c230632c312f1 +git+https://github.com/quantifyearth/yirgacheffe@4a2cab77f4a64e3f09497ee7098dc9ba499cda90 pylint mypy