From 6eca959adfc5bb8b460b684c5482c752089a82c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:02:08 +0000 Subject: [PATCH 1/6] Bump ASFHyP3/actions from 0.8.3 to 0.9.0 Bumps [ASFHyP3/actions](https://github.com/asfhyp3/actions) from 0.8.3 to 0.9.0. - [Release notes](https://github.com/asfhyp3/actions/releases) - [Changelog](https://github.com/ASFHyP3/actions/blob/develop/CHANGELOG.md) - [Commits](https://github.com/asfhyp3/actions/compare/v0.8.3...v0.9.0) --- updated-dependencies: - dependency-name: ASFHyP3/actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/changelog.yml | 2 +- .github/workflows/create-jira-issue.yml | 2 +- .github/workflows/labeled-pr.yml | 2 +- .github/workflows/release-checklist-comment.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/static-analysis.yml | 4 ++-- .github/workflows/tag-version.yml | 2 +- .github/workflows/test-and-build.yml | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 7e0f5bbb..36aedca5 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -14,6 +14,6 @@ on: jobs: call-changelog-check-workflow: # Docs: https://github.com/ASFHyP3/actions - 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 }} diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 3a138e94..e87e1c24 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.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 }} diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml index dcb89f1c..045aecae 100644 --- a/.github/workflows/labeled-pr.yml +++ b/.github/workflows/labeled-pr.yml @@ -13,4 +13,4 @@ on: jobs: call-labeled-pr-check-workflow: # Docs: https://github.com/ASFHyP3/actions - 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 diff --git a/.github/workflows/release-checklist-comment.yml b/.github/workflows/release-checklist-comment.yml index 795b49f9..04248b84 100644 --- a/.github/workflows/release-checklist-comment.yml +++ b/.github/workflows/release-checklist-comment.yml @@ -10,7 +10,7 @@ on: jobs: call-release-workflow: # Docs: https://github.com/ASFHyP3/actions - 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 permissions: pull-requests: write secrets: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 524cdfda..988debc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: call-release-workflow: # Docs: https://github.com/ASFHyP3/actions - 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 ISCE2 secrets: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 68ae2e85..f3556a7a 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -5,10 +5,10 @@ on: push jobs: call-secrets-analysis-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.8.3 + uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.9.0 call-flake8-workflow: # Docs: https://github.com/ASFHyP3/actions - 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_isce2 diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index 3ffa55c3..8fc5e484 100644 --- a/.github/workflows/tag-version.yml +++ b/.github/workflows/tag-version.yml @@ -8,7 +8,7 @@ on: jobs: call-bump-version-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.8.3 + uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.9.0 with: user: tools-bot email: UAF-asf-apd@alaska.edu diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 4bc274a0..1187d2a8 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -13,7 +13,7 @@ on: jobs: call-pytest-workflow: # Docs: https://github.com/ASFHyP3/actions - 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_isce2 python_versions: >- @@ -21,12 +21,12 @@ jobs: call-version-info-workflow: # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.8.3 + uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.9.0 call-docker-ghcr-workflow: needs: call-version-info-workflow # Docs: https://github.com/ASFHyP3/actions - uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.8.3 + uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.9.0 with: version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }} release_branch: main From 057669f22d38b1f399b96eda18cd889b8207ec0b Mon Sep 17 00:00:00 2001 From: Scott Henderson Date: Thu, 11 Jan 2024 17:09:36 -0800 Subject: [PATCH 2/6] workaround isce2 setting root logger to debug --- src/hyp3_isce2/insar_tops_burst.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hyp3_isce2/insar_tops_burst.py b/src/hyp3_isce2/insar_tops_burst.py index 9beb31da..49b3c724 100644 --- a/src/hyp3_isce2/insar_tops_burst.py +++ b/src/hyp3_isce2/insar_tops_burst.py @@ -12,6 +12,9 @@ from typing import Optional import isce +# https://github.com/isce-framework/isce2/issues/258 +root_logger = logging.getLogger() +root_logger.setLevel('WARNING') from hyp3lib.aws import upload_file_to_s3 from hyp3lib.get_orb import downloadSentinelOrbitFile from hyp3lib.image import create_thumbnail From 5a3413f7f359e2cc4bd36e18d2a13f4c5799e017 Mon Sep 17 00:00:00 2001 From: Scott Henderson Date: Fri, 12 Jan 2024 08:25:46 -0800 Subject: [PATCH 3/6] logger fix in init file --- src/hyp3_isce2/__init__.py | 4 ++++ src/hyp3_isce2/insar_tops_burst.py | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hyp3_isce2/__init__.py b/src/hyp3_isce2/__init__.py index 1f987c08..54e60a4a 100644 --- a/src/hyp3_isce2/__init__.py +++ b/src/hyp3_isce2/__init__.py @@ -2,10 +2,14 @@ import os from importlib.metadata import version from pathlib import Path +import logging # Ensures all ISCE2 paths and environment variables are set when using this module, see: # https://github.com/isce-framework/isce2/blob/main/__init__.py#L41-L50 import isce # noqa: F401 +# https://github.com/isce-framework/isce2/issues/258 +root_logger = logging.getLogger() +root_logger.setLevel('WARNING') # ISCE2 also needs its applications to be on the system path, even though they say it's only "for convenience", see: # https://github.com/isce-framework/isce2#setup-your-environment ISCE_APPLICATIONS = str(Path(os.environ['ISCE_HOME']) / 'applications') diff --git a/src/hyp3_isce2/insar_tops_burst.py b/src/hyp3_isce2/insar_tops_burst.py index 49b3c724..9beb31da 100644 --- a/src/hyp3_isce2/insar_tops_burst.py +++ b/src/hyp3_isce2/insar_tops_burst.py @@ -12,9 +12,6 @@ from typing import Optional import isce -# https://github.com/isce-framework/isce2/issues/258 -root_logger = logging.getLogger() -root_logger.setLevel('WARNING') from hyp3lib.aws import upload_file_to_s3 from hyp3lib.get_orb import downloadSentinelOrbitFile from hyp3lib.image import create_thumbnail From e2dbfecd5428196a7334e1dd78ac0abbad3e7a41 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 12 Jan 2024 12:29:01 -0900 Subject: [PATCH 4/6] Add changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a92ae4a..8b387eaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ 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). + +## [0.9.3] +### Fixed +* @scottyhq fixed excessively verbose logging due to ISCE2 setting the root logger to `DEBUG` in [#176](https://github.com/ASFHyP3/hyp3-isce2/issues/176) + ## [0.9.2] ### Fixed * `No annotation xml file` error in `insar_tops_burst` when processing HH pairs. Fixes [#168](https://github.com/ASFHyP3/hyp3-isce2/issues/168). From dfbd603639aac37c2726c23899660de1fbed9e07 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Fri, 12 Jan 2024 12:41:43 -0900 Subject: [PATCH 5/6] Fix flake8 import order and add more info to logging comment --- src/hyp3_isce2/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hyp3_isce2/__init__.py b/src/hyp3_isce2/__init__.py index 54e60a4a..9115e69b 100644 --- a/src/hyp3_isce2/__init__.py +++ b/src/hyp3_isce2/__init__.py @@ -1,22 +1,24 @@ """HyP3 plugin for ISCE2 processing""" +import logging import os from importlib.metadata import version from pathlib import Path -import logging # Ensures all ISCE2 paths and environment variables are set when using this module, see: # https://github.com/isce-framework/isce2/blob/main/__init__.py#L41-L50 import isce # noqa: F401 + +# ISCE2 sets the root logger to DEBUG resulting in excessively verbose logging, see: # https://github.com/isce-framework/isce2/issues/258 root_logger = logging.getLogger() root_logger.setLevel('WARNING') + # ISCE2 also needs its applications to be on the system path, even though they say it's only "for convenience", see: # https://github.com/isce-framework/isce2#setup-your-environment ISCE_APPLICATIONS = str(Path(os.environ['ISCE_HOME']) / 'applications') if ISCE_APPLICATIONS not in (PATH := os.environ['PATH'].split(os.pathsep)): os.environ['PATH'] = os.pathsep.join([ISCE_APPLICATIONS] + PATH) - __version__ = version(__name__) __all__ = [ From f9f7d49bc81a3d23320ba81594d21a71caee7ed6 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Fri, 12 Jan 2024 13:44:11 -0900 Subject: [PATCH 6/6] upgrade to hyp3lib>=3 --- CHANGELOG.md | 2 ++ environment.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b387eaa..55e8e013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [0.9.3] +### Changed +* Upgraded to `hyp3lib=>3,<4` from `>=2,<3` ### Fixed * @scottyhq fixed excessively verbose logging due to ISCE2 setting the root logger to `DEBUG` in [#176](https://github.com/ASFHyP3/hyp3-isce2/issues/176) diff --git a/environment.yml b/environment.yml index bd6e16ae..d09871c8 100644 --- a/environment.yml +++ b/environment.yml @@ -28,4 +28,4 @@ dependencies: - pytest-cov - pytest-mock # For running - - hyp3lib>=2,<3 + - hyp3lib>=3,<4 diff --git a/pyproject.toml b/pyproject.toml index 2e44fae5..3aa3efe3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "asf_search>=6.4.0", "geopandas", "gdal", - "hyp3lib>=2,<3", + "hyp3lib>=3,<4", # Conda-forge only dependencies are listed below # "opencv", # "isce2>=2.6.3",