Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch Release V7.0.3 #270

Merged
merged 12 commits into from
Feb 1, 2024
Merged

Patch Release V7.0.3 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1efe0c1
chore: adds new opera static ids to collections dict
Jan 31, 2024
cca423c
fix: fix typo for CSLC_STATIC dataset constant variable name
Jan 31, 2024
d8793e7
update changelog
Jan 31, 2024
3d52303
cleans up opera s1 collections and adds to S1 platform alias lists, r…
Jan 31, 2024
257c772
update changelog
Jan 31, 2024
177956e
adds more test cases against searchAPI for opera products
Jan 31, 2024
49a4d69
fix: add missing comma
Jan 31, 2024
4364599
test: update test case data and adds tests for static files against s…
Jan 31, 2024
9a3e0fd
adds calval rtc and cslc to platform collection list. Updates test ca…
Jan 31, 2024
2a5f431
Merge pull request #269 from asfadmin/chore-update-opera-processing-l…
SpicyGarlicAlbacoreRoll Jan 31, 2024
b903ce6
Merge branch 'stable' into master
SpicyGarlicAlbacoreRoll Jan 31, 2024
42d253b
Update CHANGELOG.md
SpicyGarlicAlbacoreRoll Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-

-->
------
## [v7.0.3](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.2...v7.0.3)
### Fixed
- Fixes typo for constant variable name `constants.PRODUCT_TYPE.CSLC_STATIC`
- Normalizes concept-id lists for `OPERA-S1` dataset product types

### Changed
- Completely removes `CSLC-STATIC` Calval and `RTC-STATIC` Calval collections from concept-id lists

------
## [v7.0.2](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.1...v7.0.2)
### Added
Expand Down
30 changes: 15 additions & 15 deletions asf_search/CMR/datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@

collections_per_platform = {
"SENTINEL-1A": [
"C2803501758-ASF",
"C2803501097-ASF",
"C1214470488-ASF",
"C1214470533-ASF",
"C1214470576-ASF",
Expand Down Expand Up @@ -376,12 +378,13 @@
"C1260726384-ASF",
"C1258354200-ASF",
"C1259982010-ASF",
"C2795135668-ASF",
"C1260721945-ASF",
"C1257995185-ASF",
"C1259976861-ASF",
"C1260726378-ASF",
"C1258354201-ASF",
"C1259981910-ASF",
"C2795135174-ASF",
"C1260721853-ASF",
"C1257995186-ASF",
"C1259974840-ASF",
Expand Down Expand Up @@ -417,6 +420,8 @@
"C1240784657-ASFDEV",
],
"SENTINEL-1B": [
"C2803501758-ASF",
"C2803501097-ASF",
"C1327985661-ASF",
"C1327985645-ASF",
"C1595422627-ASF",
Expand Down Expand Up @@ -462,12 +467,13 @@
"C1260726384-ASF",
"C1258354200-ASF",
"C1259982010-ASF",
"C2795135668-ASF",
"C1260721945-ASF",
"C1257995185-ASF",
"C1259976861-ASF",
"C1260726378-ASF",
"C1258354201-ASF",
"C1259981910-ASF",
"C2795135174-ASF",
"C1260721853-ASF",
"C1257995186-ASF",
"C1259974840-ASF",
Expand Down Expand Up @@ -850,17 +856,13 @@
"CSLC": [
"C2777443834-ASF",
"C1260721945-ASF",
"C1259976861-ASF",
"C2777443834-ASF",
"C1260721945-ASF",
"C2803501758-ASF",
"C1259976861-ASF",
],
"RTC": [
"C2777436413-ASF",
"C1260721853-ASF",
"C1259974840-ASF",
"C2777436413-ASF",
"C1260721853-ASF",
"C2803501097-ASF",
"C1259974840-ASF",
],
"GRD_FD": ["C1214471197-ASF", "C1212200781-ASF"],
Expand All @@ -869,9 +871,6 @@
"C2709161906-ASF",
"C1257024016-ASF",
"C1257175154-ASFDEV",
"C2709161906-ASF",
"C1257024016-ASF",
"C1257175154-ASFDEV",
],
"GUNW_AMP": [
"C1596065640-ASF",
Expand All @@ -897,12 +896,13 @@
"C1595765183-ASF",
"C1225776659-ASF",
],
"CSLC-STATIC": ["C1259982010-ASF", "C1259982010-ASF"],
"CSLC-STATIC": [
"C1259982010-ASF",
"C2795135668-ASF"
],
"RTC-STATIC": [
"C1260726378-ASF",
"C1259981910-ASF",
"C1260726378-ASF",
"C1259981910-ASF",
"C2795135174-ASF"
],
"GRD": [
"C1661710583-ASF",
Expand Down
2 changes: 1 addition & 1 deletion asf_search/constants/PRODUCT_TYPE.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@
RTC = 'RTC'
CSLC = 'CSLC'
RTC_STATIC = 'RTC-STATIC'
CSLS_STATIC = 'CSLC-STATIC'
CSLC_STATIC = 'CSLC-STATIC'
7 changes: 5 additions & 2 deletions tests/Search/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,17 @@ def run_test_dataset_search(datasets: List):
def run_test_build_subqueries(params: ASFSearchOptions, expected: List):
# mainly for getting platform aliases
preprocess_opts(params)

actual = build_subqueries(params)
for a, b in zip(actual, expected):
for key, actual_val in a:
expected_val = getattr(b, key)
if isinstance(actual_val, list):
if len(actual_val) > 0: # ASFSearchOptions leaves empty lists as None
assert len(set(expected_val).difference(set(actual_val))) == 0
expected_set = set(expected_val)
actual_set = set(actual_val)

difference = expected_set.symmetric_difference(actual_set)
assert len(difference) == 0, f"Found {len(difference)} missing entries for subquery generated keyword: \"{key}\"\n{list(difference)}"
else:
assert actual_val == expected_val

Expand Down
Loading
Loading