Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Stage in root url relative #63

Merged
merged 13 commits into from
Dec 2, 2024
+2 −3
Merged

fix: Stage in root url relative #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0801de
feat: add AUDIT log level for upload
wphyojpl Oct 14, 2024
00d6bde
chore: update outdated tests
wphyojpl Oct 14, 2024
327ef8d
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Oct 21, 2024
6fd6910
chore: merge from develop
wphyojpl Oct 21, 2024
f77e47e
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Oct 21, 2024
a51314b
fix: allow empty str as RESULT_PATH_PREFIX & replace w/ default val
wphyojpl Oct 21, 2024
2d72378
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Oct 28, 2024
0c31b5f
Merge branch 'develop' of github.community-sds/mdps-ds-lib into develop
wphyojpl Oct 28, 2024
5701e60
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 7, 2024
b429a12
erge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 7, 2024
87e82ae
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 26, 2024
b730339
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 26, 2024
76a527e
fix: root href is relative now
wphyojpl Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions mdps_ds_lib/stage_in_out/download_granules_abstract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ def download(self, **kwargs) -> str:
catalog = Catalog(
id='NA',
description='NA')
catalog.set_self_href(os.path.join(self._download_dir, 'catalog.json'))
# catalog.add_link(Link('item', failed_features_file, 'application/json'))

catalog.add_link(Link('root', f'catalog.json', 'application/json'))
if len(self._granules_json.items) < 1:
LOGGER.warning(f'cannot find any granules')
granules_json_dict = self._granules_json.to_dict(False)
Expand Down
1 change: 1 addition & 0 deletions tests/integration_tests/test_docker_stage_in.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,6 +1920,7 @@ def test_02_download__from_http_with_role(self):
catalog_result = FileUtils.read_json(f'{downloading_dir}/catalog.json')
print(catalog_result)
catalog_result = Catalog.from_dict(catalog_result)
self.assertEqual(catalog_result.links[0].href, 'catalog.json', f'wrong root: {catalog_result.links[0]}')
for each in catalog_result.links[1:]:
print(FileUtils.read_json(f'{downloading_dir}/{each.href}'))
for each_granule in zip(granule_json['features'], download_result):
Expand Down
Loading