Skip to content

Commit

Permalink
Merge pull request #90 from ACCESS-Cloud-Based-InSAR/dev
Browse files Browse the repository at this point in the history
Release v2.5.6 -- agisoft.com geoids fix
  • Loading branch information
jhkennedy authored Jun 28, 2024
2 parents 9cf3ead + d20a678 commit dfd0bb1
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 11 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ on:

jobs:
call-changelog-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected]
secrets:
USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: ASFHyP3/actions/.github/workflows/[email protected]
2 changes: 1 addition & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:

jobs:
call-labeled-pr-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].0
uses: ASFHyP3/actions/.github/workflows/[email protected].1
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
call-release-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].0
uses: ASFHyP3/actions/.github/workflows/[email protected].1
with:
release_prefix: dem-stitcher
develop_branch: dev
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on: push

jobs:
call-flake8-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].0
uses: ASFHyP3/actions/.github/workflows/[email protected].1
with:
local_package_names: dem_stitcher

call-secrets-analysis-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].0
uses: ASFHyP3/actions/.github/workflows/[email protected].1

call-ruff-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].0
uses: ASFHyP3/actions/.github/workflows/[email protected].1
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
call-bump-version-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].0
uses: ASFHyP3/actions/.github/workflows/[email protected].1
with:
user: access-cloud-insar-team
email: [email protected]
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Pytest

on:
workflow_dispatch:
branches:
- dev
- main
push:
branches:
- main
Expand All @@ -20,7 +24,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: extractions/netrc@v1
- uses: extractions/netrc@v2
with:
machine: urs.earthdata.nasa.gov
username: ${{ secrets.EARTHDATA_USERNAME }}
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.5.6]
* Updated URLs for downloading geoids from agisoft.com. Fixes [#88](https://github.com/ACCESS-Cloud-Based-InSAR/dem-stitcher/issues/88).

## [2.5.5]
* Multithreading for windowed reading during merge operation
* Add 3.12 support
Expand Down
2 changes: 1 addition & 1 deletion dem_stitcher/geoid.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from .rio_tools import reproject_arr_to_match_profile, translate_profile
from .rio_window import read_raster_from_window

AGISOFT_URL = "http://download.agisoft.com/geoids"
AGISOFT_URL = "https://s3-eu-west-1.amazonaws.com/download.agisoft.com/geoids"
GEOID_PATHS_AGI = {
"geoid_18": f"{DATA_PATH}/geoid_18.tif",
"egm_08": f"{AGISOFT_URL}/egm2008-1.tif",
Expand Down

0 comments on commit dfd0bb1

Please sign in to comment.