Skip to content

Commit

Permalink
Merge pull request #183 from ASFHyP3/develop
Browse files Browse the repository at this point in the history
Release v0.9.3
  • Loading branch information
forrestfwilliams authored Jan 16, 2024
2 parents 5713e16 + 1aabfc4 commit 040e568
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release-checklist-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ 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: >-
["3.9", "3.10"]
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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ 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]
### 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)

## [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).
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ dependencies:
- pytest-cov
- pytest-mock
# For running
- hyp3lib>=2,<3
- hyp3lib>=3,<4
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 7 additions & 1 deletion src/hyp3_isce2/__init__.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
"""HyP3 plugin for ISCE2 processing"""
import logging
import os
from importlib.metadata import version
from pathlib import Path

# 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__ = [
Expand Down

0 comments on commit 040e568

Please sign in to comment.