From 22dd92c239d9a79a1de032191c72753c5e55a350 Mon Sep 17 00:00:00 2001 From: Matt Savoie Date: Thu, 19 Dec 2024 14:50:13 -0700 Subject: [PATCH 1/5] DAS-2280: Updates reference images. --- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c00.png | 2 +- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c01.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c02.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c03.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c04.png | 2 +- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c00.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c01.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c02.png | 2 +- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c03.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c04.png | 2 +- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c00.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c01.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c02.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c03.png | 4 ++-- ...SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c04.png | 4 ++-- test/hybig/utility.py | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c00.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c00.png index 70f20757..2c7e42ee 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c00.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:279ca12a2eceb402c7b9eaeafd9c4c687f307a2475cb57597cc774b84c8d028c +oid sha256:34f8484c3b358fe49745d7518f661628fd15bb131ab6868c4b5dffe1cdfd3a0f size 26440 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c01.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c01.png index 21782e83..824e14f7 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c01.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a66a468411e3534b201cfd57297175a3d85adf21e0a872e5e86a0ab043e87eb1 -size 121400 +oid sha256:4f2385d1f15c29807eb1a2dcb70d9b5d6cb120919cb64ab08d2a57dea153cf87 +size 121392 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c02.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c02.png index 103d6ad5..7d8ec2d0 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c02.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0495420c9f4c711700a42af8c8c88ecdddc4bbcc4e135154c0eeaa55b6b63bb1 -size 47050 +oid sha256:b82c7aaa6768f14cc31131839708310d395c3d3d439b30b4fc6545afb0fbe3a7 +size 47042 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c03.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c03.png index 09b9bb69..1ca4781a 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c03.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a0b37e5dde696a663510ec31f17e134e6814940692ad20d3bec32d86c4c7936 -size 118041 +oid sha256:be04f14097138106d9a33a11b377aa044e0543d4a2ed658d824d6283699a6ec2 +size 118031 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c04.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c04.png index db2370c1..fdcdf707 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c04.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r00c04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d47d3eac527d10c95fd4bd1bda37d7fea4fc1711db64b7bd102d1f95bb985b91 +oid sha256:cf8f3389265585e10e1cf93e42dd4577ac6a6594c7a2b9d3fe6f9ae3bd7cbfc0 size 17297 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c00.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c00.png index 8ea26cca..37bd5efe 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c00.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d4a34b52302ee15812d008951fb76a8e9cbea93bb5cee806415def31d245e8e -size 73582 +oid sha256:d5d221a4902313ec3fd56d10e71338fd60bb7870fdf7b409f574fc79b8f41975 +size 73574 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c01.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c01.png index 50c0318a..8a7e5f71 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c01.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d933c55518c3b18c5ec4cf1693e8aeb7b0f57dcb3f2995e2838cea4f37fce5a -size 59551 +oid sha256:b920ad0b19dc582eeaa9625d362ec77d4cf52f332c4b3ab93237a7f2ba128d18 +size 59535 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c02.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c02.png index 70f20757..2c7e42ee 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c02.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:279ca12a2eceb402c7b9eaeafd9c4c687f307a2475cb57597cc774b84c8d028c +oid sha256:34f8484c3b358fe49745d7518f661628fd15bb131ab6868c4b5dffe1cdfd3a0f size 26440 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c03.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c03.png index 9ada6d43..ceb84da2 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c03.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52d6c35fa5570769bf6b86873bd2520873079e35a0e12b6f889d85472244dff9 -size 108647 +oid sha256:e50d1614b4a482f70176eb1cf36b2349b354d094f309d287e8e11ad511cead63 +size 108617 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c04.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c04.png index db2370c1..fdcdf707 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c04.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r01c04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d47d3eac527d10c95fd4bd1bda37d7fea4fc1711db64b7bd102d1f95bb985b91 +oid sha256:cf8f3389265585e10e1cf93e42dd4577ac6a6594c7a2b9d3fe6f9ae3bd7cbfc0 size 17297 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c00.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c00.png index cd436a5f..b7134f04 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c00.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d261635d72cc13dec1d21640cb0b74aaaca3aa6dde15c7e9b268220bb86f8c88 -size 20834 +oid sha256:37ca04df09bf0c36f0625aa6e241ff6121c2b0bddecf86ecf9602d1e68e6ae32 +size 20833 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c01.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c01.png index c8144b06..902bfca8 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c01.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c01.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e68e538ee0b7416b18c9d6dd3639c9a92e6e4900818d3160cbf048555d71a06c -size 7427 +oid sha256:3d9abbd77fd6e785c77922d947a7667523639666b3817e05e760b385ec1f26c4 +size 7426 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c02.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c02.png index c8144b06..902bfca8 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c02.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c02.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e68e538ee0b7416b18c9d6dd3639c9a92e6e4900818d3160cbf048555d71a06c -size 7427 +oid sha256:3d9abbd77fd6e785c77922d947a7667523639666b3817e05e760b385ec1f26c4 +size 7426 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c03.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c03.png index cd793106..f73885eb 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c03.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c03.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d7e14a390f07f44ca62e4432a894c510df7e707fcf64e72a38a26a7c53eabea -size 18579 +oid sha256:50b3fc1e72f843d436fd29ab54bb77f9e5341205f286496b2da3f97b48d57e87 +size 18578 diff --git a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c04.png b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c04.png index 91daa45a..2f8b8d4e 100644 --- a/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c04.png +++ b/test/hybig/reference_data/colour_map/PREFIRE_SAT2_2B-FLX_S07_R00_20210721013413_03040.nc.G00.r02c04.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bcb6335cf067d2b295d7bd66b0b3e39f77bc0b8899d382d1e67afb81497a05f -size 8316 +oid sha256:8d537f1e70cbb422783d39c261f547a45b53dc9fa20d4e898474dc5ead7468a4 +size 8315 diff --git a/test/hybig/utility.py b/test/hybig/utility.py index 9e405328..4e9e4da9 100644 --- a/test/hybig/utility.py +++ b/test/hybig/utility.py @@ -31,7 +31,7 @@ def assert_dataset_produced_correct_results( with rasterio.open(reference_file) as reference_dataset: assert ( test_dataset.meta == reference_dataset.meta - ), f'output {file_type} has incorrect metadata: {test_dataset.meta}' + ), f'output {file_type} has incorrect metadata:\nTest Result Metadata:\n{test_dataset.meta}\nReference Metadata\n{reference_dataset.meta}' print_success('Generated image has correct metadata.') ref_image = reference_dataset.read() From a5bc9afb41ce1f7653dfe508829dd7969767fcdf Mon Sep 17 00:00:00 2001 From: Matt Savoie Date: Thu, 19 Dec 2024 15:57:30 -0700 Subject: [PATCH 2/5] DAS-2280: Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63830cd..445d8880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,15 @@ versioning. Rather than a static releases, this repository contains of a number of regression tests that are each semi-independent. This CHANGELOG file should be used to document pull requests to this repository. + ## 2024-12-20([#126](https://github.com/nasa/harmony-regression-tests/pull/126)) - Update configuration to run `opera-rtc-s1-browse` tests on HyBIG deployments. +## 2024-12-19 ([#125](https://github.com/nasa/harmony-regression-tests/pull/125)) + +- Updates HyBIG test images to account for increased color map range (DAS-2280) + ## 2024-12-16 ([#122](https://github.com/nasa/harmony-regression-tests/pull/122))([#123](https://github.com/nasa/harmony-regression-tests/pull/123)) - Updates HyBIG test images to account for changes in how HyBIG treats 3 and 4 band input GeoTIFFs. From 50ff601be87cf90b88a867b7617b4a285a1dafa4 Mon Sep 17 00:00:00 2001 From: Matt Savoie Date: Fri, 20 Dec 2024 11:21:20 -0700 Subject: [PATCH 3/5] DAS-2280: remove newline in CHANGELOG --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 445d8880..de5412ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ versioning. Rather than a static releases, this repository contains of a number of regression tests that are each semi-independent. This CHANGELOG file should be used to document pull requests to this repository. - ## 2024-12-20([#126](https://github.com/nasa/harmony-regression-tests/pull/126)) - Update configuration to run `opera-rtc-s1-browse` tests on HyBIG deployments. From d10acb033eed3f9b3ffafc9be5cf5cf4e9546197 Mon Sep 17 00:00:00 2001 From: Matt Savoie Date: Fri, 20 Dec 2024 15:47:18 -0700 Subject: [PATCH 4/5] DAS-2280: Bump hybig version (minor for kicks) --- test/hybig/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hybig/version.txt b/test/hybig/version.txt index 2cfabea2..6e8bf73a 100644 --- a/test/hybig/version.txt +++ b/test/hybig/version.txt @@ -1 +1 @@ -0.0.11 +0.1.0 From 94945624e234e3cfd0f115746d7518d548018d29 Mon Sep 17 00:00:00 2001 From: Matt Savoie Date: Sat, 21 Dec 2024 12:31:50 -0700 Subject: [PATCH 5/5] DAS-2280: reset version to patch. --- test/hybig/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hybig/version.txt b/test/hybig/version.txt index 6e8bf73a..8cbf02c3 100644 --- a/test/hybig/version.txt +++ b/test/hybig/version.txt @@ -1 +1 @@ -0.1.0 +0.0.12