Merge pull request #537 from ASFHyP3/develop

Release v8.0.0

.github/workflows/changelog.yml

@@ -13,6 +13,6 @@ on:
 
 jobs:
   call-changelog-check-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.9.0
     secrets:
       USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/create-jira-issue.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   call-create-jira-issue-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.9.0
     secrets:
       JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
       JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}

.github/workflows/labeled-pr.yml

@@ -12,4 +12,4 @@ on:
 
 jobs:
   call-labeled-pr-check-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.9.0

.github/workflows/release-template-comment.yml

@@ -7,6 +7,6 @@ on:
 
 jobs:
   call-release-checklist-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.9.0
     secrets:
       USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.9.0
     with:
       release_prefix: HyP3 GAMMA
     secrets:

.github/workflows/static-analysis.yml

@@ -4,9 +4,9 @@ on: push
 
 jobs:
   call-flake8-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-flake8.yml@v0.9.0
     with:
       local_package_names: hyp3_gamma
 
   call-secrets-analysis-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.9.0

.github/workflows/tag-version.yml

@@ -7,6 +7,6 @@ on:
 
 jobs:
   call-bump-version-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.9.0
     secrets:
       USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}

.github/workflows/test-and-build.yml

@@ -18,14 +18,14 @@ env:
 
 jobs:
   call-pytest-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.9.0
     with:
       local_package_name: hyp3_gamma
       python_versions: >-
         ["3.10"]
 
   call-version-info-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.8.3
+    uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.9.0
     with:
       python_version: '3.10'
 

CHANGELOG.md

@@ -6,6 +6,16 @@ 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).
 
+## [8.0.0]
+
+### Removed
+- Support for legacy SRTM/NED DEMs in RTC processing. All RTC processing now uses the Copernicus DEM.
+  - `legacy` option for the `--dem-name` parameter of `__main__.rtc()`
+  - `legacy` option for the `--dem-name` parameter of `rtc_sentinel.main()`
+  - `legacy` option for the `dem_name` parameter of `rtc_sentinel.rtc_sentinel_gamma()`
+  - `EU_DEM_V11`, `GIMP`, `IFSAR`, `NED13`, `NED1`, `NED2`, `REMA`, `SRTMGL1`, and `SRTMGL3` entries from
+    `metadata.rtc.SUPPORTED_DEMS`
+
 ## [7.0.1]
 
 ### Fixed

hyp3_gamma/__main__.py

@@ -94,7 +94,7 @@ def rtc():
     parser.add_argument('--include-inc-map', type=string_is_true, default=False)
     parser.add_argument('--include-scattering-area', type=string_is_true, default=False)
     parser.add_argument('--include-rgb', type=string_is_true, default=False)
-    parser.add_argument('--dem-name', choices=['copernicus', 'legacy'], default='copernicus')
+    parser.add_argument('--dem-name', choices=['copernicus'], default='copernicus')
     parser.add_argument('granule')
     args = parser.parse_args()
 

hyp3_gamma/metadata/rtc.py

@@ -11,7 +11,7 @@
 from hyp3_gamma.metadata import util
 
 
-SUPPORTED_DEMS = ['EU_DEM_V11', 'GIMP', 'IFSAR', 'NED13', 'NED1', 'NED2', 'REMA', 'SRTMGL1', 'SRTMGL3', 'GLO-30']
+SUPPORTED_DEMS = ['GLO-30']
 
 
 class RtcMetadataWriter:
@@ -125,18 +125,6 @@ def create_metadata_file(cls, payload: dict, template: str, reference_file: Path
 
 
 def get_dem_template_id(dem_name: str) -> Optional[str]:
-    if dem_name.startswith('EU'):
-        return 'eu'
-    if dem_name.startswith('GIMP'):
-        return 'gimp'
-    if dem_name.startswith('IFSAR'):
-        return 'ifsar'
-    if dem_name.startswith('NED'):
-        return 'ned'
-    if dem_name.startswith('REMA'):
-        return 'rema'
-    if dem_name.startswith('SRTM'):
-        return 'srtm'
     if dem_name == 'GLO-30':
         return 'cop'