Merge version 1.1.0 and version 1.1.1 from Das 2208 smap l3 feature branch to main branch #23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#16) * DAS-2232 -small functions added to support the main solution in the ticket * DAS-2232 - updated notebook version to 7.2.2 * DAS-2232 - Updates based on PR feedback * DAS-2232 - updates to unit tests basd on PR feedback * DAS-2232 - removed commented code * DAS-2232 - updated get_valid_indices method * DAS-2232 - updated get_valid_indices method and some unit tests based on PR feedback * DAS-2232 - updated get_variables_with_anonymous_dims * DAS-2232 - added unit tests for any_absent_dimension_variables funciton
…e the dimensions (#18) * DAS-2236 - added functions to get end to end test working * DAS-2232 - updated the get_valid_geo_grid_points function to get maximum distances * DAS-2236 - updated the method to get the points * DAS-2236 - Added missing unit tests * tests/unit/test_coordinate_utilities.py * DAS-2236 - refactoring and cleanup * DAS-2236 - updates based on PR feedback * DAS-2236 - comment update based on PR feedback * DAS-2236 - updates based on David's PR feedback * DAS-2236 - updates based on PR feedback * DAS-2236 - updated functions and tests based on PR feedback * DAS-2236 - renamed add_bounds_variables * DAS-2236 - updated unit tests * DAS-2236 - updates to unit tests * DAS-2236 - added unit tests for get_range_strings * DAS-2236 - added unit tests for get_prefetch_variables * DAS-2236 - renamed get_max_x_spread_pts * DAS-2236 - minor updates to unit tests * DAS-2236 - removed an exception that was not needed * DAS-2236 - added more unit tests for get_coordinate_variables * DAS-2236 - added exception when no prefetch variables are returned * DAS-2236 updated comments based on PR feedback
…#19) * DAS-2236 - added functions to get end to end test working * DAS-2232 - updated the get_valid_geo_grid_points function to get maximum distances * DAS-2236 - updated the method to get the points * DAS-2236 - Added missing unit tests * tests/unit/test_coordinate_utilities.py * DAS-2236 - refactoring and cleanup * DAS-2236 - updates based on PR feedback * DAS-2236 - comment update based on PR feedback * DAS-2236 - updates based on David's PR feedback * DAS-2236 - updates based on PR feedback * DAS-2236 - updated functions and tests based on PR feedback * DAS-2236 - renamed add_bounds_variables * DAS-2236 - updated unit tests * DAS-2236 - updates to unit tests * DAS-2236 - added unit tests for get_range_strings * DAS-2236 - added unit tests for get_prefetch_variables * DAS-2270 - dimension order check for 2D datasets in SMAP L3 * DAS-2270 - PR feedback updates and unit test updates * DAS-2270 - updated service version and changelog * DAS-2270 - updated changelog * DAS-2270 - added unit test for create_dimension_arrays_from_coordinates * DAS-2270 - hoss_config.json updated to include SPL3FTA in override for grid_mapping_name * DAS-2270 - added changes from DAS-2236 PR updates * hoss/coordinate_utilities.py * DAS-2270 - fixed some of the merge conflicts with feature branch * DAS-2270 - fixed some of the merge conflicts with feature branch * DAS-2270 - rebase with feature branch * DAS-2270 - added changes back on feature branch * DAS-2270 - resolved merge conflicts * DAS-2270 - fixed get_dimension_order function * DAS-2270 - removed recalculation of projected dims * DAS-2270 - updates based on PR feedback * DAS-2270 - some minor 3D updates * DAS-2270 - PR updates * DAS-2270 - reordered the functions based on PR feedback * DAS-2270 - added exception when the dimension order is not the nominal 'y,x' order
sudha-murthy
requested review from
flamingbear,
owenlittlejohns,
D-Auty and
joeyschultz
flamingbear
reviewed
Jan 16, 2025
CHANGELOG.md
Outdated
| ## v1.1.1 | ||
| ### 2025-01-14 | ||
|
|
||
| This version of HOSS releases the HOSS codebase from a feature branch that contain V1.1.0 to the main branch. |
There was a problem hiding this comment.
Suggested change
| This version of HOSS releases the HOSS codebase from a feature branch that contain V1.1.0 to the main branch. | |
| This version of HOSS merges the feature branch containing v1.1.0 to the main branch. |
There was a problem hiding this comment.
Suggested change
| This version of HOSS releases the HOSS codebase from a feature branch that contain V1.1.0 to the main branch. | |
| This version of HOSS releases the HOSS codebase from a feature branch that contains v1.1.0 to the main branch. |
There was a problem hiding this comment.
I don't love the sentence as structured, but at a minimum, make contain -> contains
There was a problem hiding this comment.
made the updates. Thanks!
flamingbear
approved these changes
Jan 16, 2025
There was a problem hiding this comment.
Looks good. I was able to run the unit tests and regression tests. I could not update the jupter notebook regression repository and I dont' want to try to download however large that is now on my phone.
I do ask to update the comment in the changelog either with my suggestion or at least add the s. But I can approve. Thanks
CHANGELOG.md
Outdated
| ## v1.1.1 | ||
| ### 2025-01-14 | ||
|
|
||
| This version of HOSS releases the HOSS codebase from a feature branch that contain V1.1.0 to the main branch. |
There was a problem hiding this comment.
Suggested change
| This version of HOSS releases the HOSS codebase from a feature branch that contain V1.1.0 to the main branch. | |
| This version of HOSS releases the HOSS codebase from a feature branch that contains v1.1.0 to the main branch. |
CHANGELOG.md
Outdated
| ## v1.1.1 | ||
| ### 2025-01-14 | ||
|
|
||
| This version of HOSS releases the HOSS codebase from a feature branch that contain V1.1.0 to the main branch. |
There was a problem hiding this comment.
I don't love the sentence as structured, but at a minimum, make contain -> contains
sudha-murthy
force-pushed
the
DAS-2208-SMAP-L3
branch
from
156f128 to
bdb156b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This merge would include changes from the feature branch to main
Fully working
Partially working
Not working
Jira Issue ID
DAS-2208
Local Test Steps
git clone hoss from the feature branch and build hoss
git clone mask fill - https://git.earthdata.nasa.gov/scm/sitc/maskfill.git
Run harmony in a box
This request should complete successfully as a quick end to end test
http://localhost:3000/C1268452378-EEDTEST/ogc-api-coverages/1.0.0/collections/parameter_vars/coverage/rangeset?forceAsync=true&granuleId=G1268452388-EEDTEST&subset=lat(70%3A80)&subset=lon(-160%3A-150)&variable=Soil_Moisture_Retrieval_Data_AM%2Fstatic_water_body_fraction&skipPreview=true
Harmony regression tests contain hoss regression tests that should succeed. They are under
https://github.com/nasa/harmony-regression-tests/tree/main/test/hoss
Detailed testing can be done with the jupyter notebooks for each product.
git clone jupyter notebooks from https://git.earthdata.nasa.gov/scm/sitc/das-collections-harmony-testing.git
for the following products SPL2SMAP_S, SPL3SMP, SPL3SMP_E, SPL3SMA, SPL3SMAP.
The tests should complete successfully.
PR Acceptance Checklist
CHANGELOG.mdupdated to include high level summary of PR changes.docker/service_version.txtupdated if publishing a release.