From fc3a80902003ad3227028c2389b68a45f4e93a86 Mon Sep 17 00:00:00 2001
From: ptresson <paul.tresson@ird.fr>
Date: Tue, 18 Mar 2025 12:23:07 +0100
Subject: [PATCH] reset merge error handling, update GA to run on dev for now
---
.github/workflows/jobs.yml | 2 +-
utils/geo.py | 27 +++++++++++++++++++--------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/jobs.yml b/.github/workflows/jobs.yml
index 1c13bd9..875ce6d 100644
--- a/.github/workflows/jobs.yml
+++ b/.github/workflows/jobs.yml
@@ -3,7 +3,7 @@ name: CI/CD Pipeline
on:
push:
branches:
- - main
+ - main, dev
pull_request:
branches:
- main, dev
diff --git a/utils/geo.py b/utils/geo.py
index e21aab4..f0cd989 100644
--- a/utils/geo.py
+++ b/utils/geo.py
@@ -58,14 +58,25 @@ def merge_tiles(
if method == "average":
method = custom_method_avg
- merge(
- sources=file_handler, # list of dataset objects opened in 'r' mode
- bounds=union_extent, # tuple
- nodata=nodata, # float
- dtype=dtype, # dtype
- method=method, # strategy to combine overlapping rasters
- dst_path=dst_path,
- )
+ try:
+ merge(
+ sources=file_handler, # list of dataset objects opened in 'r' mode
+ bounds=union_extent, # tuple
+ nodata=nodata, # float
+ dtype=dtype, # dtype
+ method=method, # strategy to combine overlapping rasters
+ dst_path=dst_path,
+ )
+ ## different rasterio versions take different keyword args
+ except TypeError:
+ merge(
+ datasets=file_handler, # list of dataset objects opened in 'r' mode
+ bounds=union_extent, # tuple
+ nodata=nodata, # float
+ dtype=dtype, # dtype
+ method=method, # strategy to combine overlapping rasters
+ dst_path=dst_path,
+ )
# close datasets
for ds in file_handler:
--
GitLab