From 4df66ed230f7ad9c0830051f759ad663a245d3fd Mon Sep 17 00:00:00 2001 From: Forrest Williams Date: Fri, 2 May 2025 12:24:33 -0500 Subject: [PATCH 1/6] update dir names --- CHANGELOG.md | 5 +++++ src/hyp3_opera_rtc/etc/entrypoint.sh | 2 +- src/hyp3_opera_rtc/prep_rtc.py | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af7b2e2..bf5235c 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.1.2] + +### Changed +- Added `_dir` to end of input, scratch, and work directories to match OPERA setup + ## [0.1.1] ### Changed diff --git a/src/hyp3_opera_rtc/etc/entrypoint.sh b/src/hyp3_opera_rtc/etc/entrypoint.sh index 2675cfc..76dd9fb 100755 --- a/src/hyp3_opera_rtc/etc/entrypoint.sh +++ b/src/hyp3_opera_rtc/etc/entrypoint.sh @@ -6,4 +6,4 @@ export PYTHONPATH=$PYTHONPATH:${PGE_DEST_DIR} python -um hyp3_opera_rtc.prep_rtc "$@" --work-dir /home/rtc_user/scratch conda run -n RTC /home/rtc_user/opera/scripts/pge_main.py -f /home/rtc_user/scratch/runconfig.yml -python -um hyp3_opera_rtc.upload_rtc "$@" --output-dir /home/rtc_user/scratch/output +python -um hyp3_opera_rtc.upload_rtc "$@" --output-dir /home/rtc_user/scratch/output_dir diff --git a/src/hyp3_opera_rtc/prep_rtc.py b/src/hyp3_opera_rtc/prep_rtc.py index fc6fb28..593543e 100644 --- a/src/hyp3_opera_rtc/prep_rtc.py +++ b/src/hyp3_opera_rtc/prep_rtc.py @@ -118,9 +118,9 @@ def prep_rtc( work_dir: Working directory for processing resolution: Resolution of the output RTC (m) """ - scratch_dir = work_dir / 'scratch' - input_dir = work_dir / 'input' - output_dir = work_dir / 'output' + scratch_dir = work_dir / 'scratch_dir' + input_dir = work_dir / 'input_dir' + output_dir = work_dir / 'output_dir' for d in [scratch_dir, input_dir, output_dir]: d.mkdir(parents=True, exist_ok=True) From 5ad0d04ab38bfb2d0414fac3765b42d0645d2bba Mon Sep 17 00:00:00 2001 From: Forrest Williams Date: Fri, 2 May 2025 12:58:19 -0500 Subject: [PATCH 2/6] update base dir --- src/hyp3_opera_rtc/etc/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hyp3_opera_rtc/etc/entrypoint.sh b/src/hyp3_opera_rtc/etc/entrypoint.sh index 76dd9fb..af1545c 100755 --- a/src/hyp3_opera_rtc/etc/entrypoint.sh +++ b/src/hyp3_opera_rtc/etc/entrypoint.sh @@ -4,6 +4,6 @@ set -e # Make the PGE "opera" package discoverable because it is not installed export PYTHONPATH=$PYTHONPATH:${PGE_DEST_DIR} -python -um hyp3_opera_rtc.prep_rtc "$@" --work-dir /home/rtc_user/scratch -conda run -n RTC /home/rtc_user/opera/scripts/pge_main.py -f /home/rtc_user/scratch/runconfig.yml -python -um hyp3_opera_rtc.upload_rtc "$@" --output-dir /home/rtc_user/scratch/output_dir +python -um hyp3_opera_rtc.prep_rtc "$@" --work-dir /home/rtc_user +conda run -n RTC /home/rtc_user/opera/scripts/pge_main.py -f /home/rtc_user/runconfig.yml +python -um hyp3_opera_rtc.upload_rtc "$@" --output-dir /home/rtc_user/output_dir From a9d3435e773aab4ba9ef7d5160d3cd4d2f2a8e4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 07:55:49 +0000 Subject: [PATCH 3/6] Bump ruff from 0.11.6 to 0.11.8 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.11.6 to 0.11.8. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.11.6...0.11.8) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.11.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-static.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-static.txt b/requirements-static.txt index 53143ee..ab2d803 100644 --- a/requirements-static.txt +++ b/requirements-static.txt @@ -1,4 +1,4 @@ -ruff==0.11.6 +ruff==0.11.8 mypy==1.15.0 lxml-stubs types-shapely From 1461bd50bff5407d1ba13d7b6e97465e1d447244 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Fri, 9 May 2025 10:10:01 -0800 Subject: [PATCH 4/6] ugpraded to hyp3lib v4 --- CHANGELOG.md | 5 +++++ environment.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf5235c..0ef4385 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.1.3] + +### Changed +- Upgraded to hyp3lib v4. + ## [0.1.2] ### Changed diff --git a/environment.yml b/environment.yml index 0046512..ea19e40 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - pip - gdal>=3.0 - shapely - - hyp3lib + - hyp3lib>4,<5 - boto3 - jinja2 # For packaging, and testing From 8df55fde81e1314dcb087820036431d27c342126 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Fri, 9 May 2025 10:12:48 -0800 Subject: [PATCH 5/6] fix typo in hyp3lib version pin --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index ea19e40..9c7dc94 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - pip - gdal>=3.0 - shapely - - hyp3lib>4,<5 + - hyp3lib>=4,<5 - boto3 - jinja2 # For packaging, and testing From fa66593751b29dc53039ea1908486ef5af16befc Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Fri, 9 May 2025 11:40:53 -0800 Subject: [PATCH 6/6] combine changelog entries --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ef4385..d0a7ee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +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.1.3] - -### Changed -- Upgraded to hyp3lib v4. - ## [0.1.2] ### Changed - Added `_dir` to end of input, scratch, and work directories to match OPERA setup +- Upgraded to hyp3lib v4. ## [0.1.1]