From 355f72c0ad7604672138a84293dd02581d633ffb Mon Sep 17 00:00:00 2001 From: "Peter A. Jonsson" Date: Wed, 10 Sep 2025 15:35:08 +0200 Subject: [PATCH] dc_tools: use datacube functions These functions were added to datacube years ago, so use them instead of the versions in odc.aws. --- apps/dc_tools/odc/apps/dc_tools/s3_inventory.py | 2 +- apps/dc_tools/odc/apps/dc_tools/s3_to_dc.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/dc_tools/odc/apps/dc_tools/s3_inventory.py b/apps/dc_tools/odc/apps/dc_tools/s3_inventory.py index e28f2631..2da6d3ed 100644 --- a/apps/dc_tools/odc/apps/dc_tools/s3_inventory.py +++ b/apps/dc_tools/odc/apps/dc_tools/s3_inventory.py @@ -2,7 +2,7 @@ import re import sys from fnmatch import fnmatch -from odc.aws import s3_client +from datacube.utils.aws import s3_client from odc.aws.inventory import list_inventory diff --git a/apps/dc_tools/odc/apps/dc_tools/s3_to_dc.py b/apps/dc_tools/odc/apps/dc_tools/s3_to_dc.py index d2b04ef4..23834370 100755 --- a/apps/dc_tools/odc/apps/dc_tools/s3_to_dc.py +++ b/apps/dc_tools/odc/apps/dc_tools/s3_to_dc.py @@ -13,6 +13,12 @@ from datacube import Datacube from datacube.index.hl import Doc2Dataset from datacube.ui.click import environment_option, pass_config +from datacube.utils.aws import ( + _aws_unsigned_check_env, + auto_find_region, + s3_client, + s3_fetch, +) from datacube.utils.documents import parse_doc_stream from odc.aio import S3Fetcher, s3_find_glob from odc.apps.dc_tools.utils import ( @@ -37,7 +43,6 @@ url_string_replace, verify_lineage, ) -from odc.aws import _aws_unsigned_check_env, auto_find_region, s3_client, s3_fetch from pystac import Item