From fc91f20bbd06a9e32292846d0609aaf5419c9a39 Mon Sep 17 00:00:00 2001 From: tcchase Date: Wed, 23 Apr 2025 09:50:26 -0400 Subject: [PATCH 01/11] feat: add sentinel-1c dataset --- SearchAPI/CMR/SubQuery.py | 4 ++-- .../CMR/Translate/collections_by_platform.py | 23 +++++++++++++++++++ SearchAPI/CMR/Translate/datasets.py | 17 ++++++++++++++ SearchAPI/CMR/Translate/input_fixer.py | 14 ++++++----- SearchAPI/CMR/Translate/parse_cmr_response.py | 2 +- 5 files changed, 51 insertions(+), 9 deletions(-) diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py index 5f77553f..10766cd1 100644 --- a/SearchAPI/CMR/SubQuery.py +++ b/SearchAPI/CMR/SubQuery.py @@ -60,8 +60,8 @@ def combine_params(self, params, extra_params): return final def should_use_asf_frame(self): - asf_frame_platforms = ['SENTINEL-1A', 'SENTINEL-1B', 'ALOS'] - asf_frame_datasets = ['SENTINEL-1', 'OPERA-S1', 'SLC-BURST', 'ALOS PALSAR', 'ALOS AVNIR-2', 'ALOS-2'] + asf_frame_platforms = ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C' 'ALOS'] + asf_frame_datasets = ['SENTINEL-1', 'OPERA-S1', 'SLC-BURST', 'ALOS PALSAR', 'ALOS AVNIR-2', 'ALOS-2', 'NISAR'] asf_frame_collections = [] for dataset in asf_frame_datasets: diff --git a/SearchAPI/CMR/Translate/collections_by_platform.py b/SearchAPI/CMR/Translate/collections_by_platform.py index e9f1ec8f..6aae55ec 100644 --- a/SearchAPI/CMR/Translate/collections_by_platform.py +++ b/SearchAPI/CMR/Translate/collections_by_platform.py @@ -333,6 +333,25 @@ "concept-id": "C1327985661-ASF" } ], + "SENTINEL-1C": [ + { "collection": "SENTINEL-1C_RAW", "concept-id": "C3486496642-ASF"}, + { "collection": "SENTINEL-1C_SLC", "concept-id": "C3470873558-ASF"}, + { "collection": "SENTINEL-1C_META_SLC", "concept-id": "C3484561061-ASF"}, + { "collection": "SENTINEL-1C_OCN", "concept-id": "C3484661603-ASF"}, + { "collection": "SENTINEL-1C_META_OCN", "concept-id": "C3484670556-ASF"}, + { "collection": "SENTINEL-1C_DP_GRD_HIGH", "concept-id": "C3486566209-ASF"}, + { "collection": "SENTINEL-1C_DP_META_GRD_HIGH", "concept-id": "C3486580531-ASF"}, + { "collection": "SENTINEL-1C_DP_GRD_MEDIUM", "concept-id": "C3486605959-ASF"}, + { "collection": "SENTINEL-1C_DP_META_GRD_MEDIUM", "concept-id": "C3486616327-ASF"}, + { "collection": "SENTINEL-1C_DP_GRD_FULL", "concept-id": "C3486646217-ASF"}, + { "collection": "SENTINEL-1C_DP_META_GRD_FULL", "concept-id": "C3486655250-ASF"}, + { "collection": "SENTINEL-1C_SP_GRD_HIGH", "concept-id": "C3488402208-ASF"}, + { "collection": "SENTINEL-1C_SP_META_GRD_HIGH", "concept-id": "C3488406939-ASF"}, + { "collection": "SENTINEL-1C_SP_GRD_MEDIUM", "concept-id": "C3488414315-ASF"}, + { "collection": "SENTINEL-1C_SP_META_GRD_MEDIUM", "concept-id": "C3488417229-ASF"}, + { "collection": "SENTINEL-1C_SP_GRD_FULL", "concept-id": "C3488389367-ASF"}, + { "collection": "SENTINEL-1C_SP_META_GRD_FULL", "concept-id": "C3488394269-ASF"}, + ], "SMAP": [ { "collection": "SMAP_L1A_RADAR_METADATA_V001", @@ -942,6 +961,8 @@ "concept-id": "C1216244348-ASF" } ], + "SENTINEL-1C": [ + ], "SMAP": [ { "collection": "SMAP_L1A_RADAR_METADATA_V001", @@ -1477,6 +1498,8 @@ "concept-id": "C1234413263-ASFDEV" } ], + "SENTINEL-1C": [ + ], "STS-59": [ { "collection": "STS-59_BROWSE_GRD", diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 874811e0..de22de0f 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -110,6 +110,23 @@ "C1257175154-ASFDEV", "C1244598379-ASFDEV", "C1240784657-ASFDEV", + "C3470873558-ASF", + "C3486496642-ASF", + "C3484561061-ASF", + "C3484661603-ASF", + "C3484670556-ASF", + "C3486566209-ASF", + "C3486580531-ASF", + "C3486605959-ASF", + "C3486616327-ASF", + "C3486646217-ASF", + "C3486655250-ASF", + "C3488402208-ASF", + "C3488406939-ASF", + "C3488414315-ASF", + "C3488417229-ASF", + "C3488389367-ASF", + "C3488394269-ASF" ], "OPERA-S1": [ "C2777443834-ASF", diff --git a/SearchAPI/CMR/Translate/input_fixer.py b/SearchAPI/CMR/Translate/input_fixer.py index fb581bba..9828cd22 100644 --- a/SearchAPI/CMR/Translate/input_fixer.py +++ b/SearchAPI/CMR/Translate/input_fixer.py @@ -61,9 +61,9 @@ def input_fixer(params, is_prod: bool = False, provider: str = "ASF"): # conversion plat_aliases = { - 'S1': ['SENTINEL-1A', 'SENTINEL-1B'], - 'SENTINEL-1': ['SENTINEL-1A', 'SENTINEL-1B'], - 'SENTINEL': ['SENTINEL-1A', 'SENTINEL-1B'], + 'S1': ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C'], + 'SENTINEL-1': ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C'], + 'SENTINEL': ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C'], 'ERS': ['ERS-1', 'ERS-2'], 'SIR-C': ['STS-59', 'STS-68'] } @@ -80,6 +80,7 @@ def input_fixer(params, is_prod: bool = False, provider: str = "ASF"): 'SEASAT': 'SEASAT 1', 'SA': 'SENTINEL-1A', 'SB': 'SENTINEL-1B', + 'SC': 'SENTINEL-1C', 'SP': 'SMAP', 'UA': 'G-III', 'UAVSAR': 'G-III' @@ -105,12 +106,13 @@ def input_fixer(params, is_prod: bool = False, provider: str = "ASF"): for p in v: if p.upper() in plat_aliases: for x in plat_aliases[p.upper()]: - if x in ['SENTINEL-1A', 'SENTINEL-1B'] and any_processing_level: + if x in ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C'] and any_processing_level: collection_list.extend([id_by_platform['concept-id'] for id_by_platform in to_collections[x]]) platform_list.append(x) else: - if ((p.upper() in plat_names and p.upper() in ['SA', 'SB']) or p.upper() in ['SENTINEL-1A', 'SENTINEL-1B']) and any_processing_level: - if p.upper() in plat_names and p.upper() in ['SA', 'SB']: + if ((p.upper() in plat_names and p.upper() in ['SA', 'SB', 'SC']) or p.upper() in ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C']) and any_processing_level: + if p.upper() in plat_names and p.upper() in ['SA', 'SB', 'SC']: + to_collections collection_list.extend([id_by_platform['concept-id'] for id_by_platform in to_collections[plat_names[p.upper()]]]) else: collection_list.extend([id_by_platform['concept-id'] for id_by_platform in to_collections[p.upper()]]) diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index bffc6605..a3476a3c 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -71,7 +71,7 @@ def remove_field(f): if 'frameNumber' in req_fields: asf_frame_platforms = [ - 'Sentinel-1A', 'Sentinel-1B', 'ALOS', 'SENTINEL-1A', 'SENTINEL-1B', + 'Sentinel-1A', 'Sentinel-1B', 'Sentinel-1C', 'ALOS', 'SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C' 'ERS-1', 'ERS-2', 'JERS-1', 'RADARSAT-1', 'ALOS-2', 'NISAR' ] From efff6cbdbf1a0980c1ce1364aad9dcee7126f1f8 Mon Sep 17 00:00:00 2001 From: tcchase Date: Wed, 23 Apr 2025 10:11:42 -0400 Subject: [PATCH 02/11] chore: format collections --- .../CMR/Translate/collections_by_platform.py | 85 +++++++++++++++---- SearchAPI/CMR/Translate/datasets.py | 2 +- 2 files changed, 69 insertions(+), 18 deletions(-) diff --git a/SearchAPI/CMR/Translate/collections_by_platform.py b/SearchAPI/CMR/Translate/collections_by_platform.py index 6aae55ec..5b646647 100644 --- a/SearchAPI/CMR/Translate/collections_by_platform.py +++ b/SearchAPI/CMR/Translate/collections_by_platform.py @@ -334,23 +334,74 @@ } ], "SENTINEL-1C": [ - { "collection": "SENTINEL-1C_RAW", "concept-id": "C3486496642-ASF"}, - { "collection": "SENTINEL-1C_SLC", "concept-id": "C3470873558-ASF"}, - { "collection": "SENTINEL-1C_META_SLC", "concept-id": "C3484561061-ASF"}, - { "collection": "SENTINEL-1C_OCN", "concept-id": "C3484661603-ASF"}, - { "collection": "SENTINEL-1C_META_OCN", "concept-id": "C3484670556-ASF"}, - { "collection": "SENTINEL-1C_DP_GRD_HIGH", "concept-id": "C3486566209-ASF"}, - { "collection": "SENTINEL-1C_DP_META_GRD_HIGH", "concept-id": "C3486580531-ASF"}, - { "collection": "SENTINEL-1C_DP_GRD_MEDIUM", "concept-id": "C3486605959-ASF"}, - { "collection": "SENTINEL-1C_DP_META_GRD_MEDIUM", "concept-id": "C3486616327-ASF"}, - { "collection": "SENTINEL-1C_DP_GRD_FULL", "concept-id": "C3486646217-ASF"}, - { "collection": "SENTINEL-1C_DP_META_GRD_FULL", "concept-id": "C3486655250-ASF"}, - { "collection": "SENTINEL-1C_SP_GRD_HIGH", "concept-id": "C3488402208-ASF"}, - { "collection": "SENTINEL-1C_SP_META_GRD_HIGH", "concept-id": "C3488406939-ASF"}, - { "collection": "SENTINEL-1C_SP_GRD_MEDIUM", "concept-id": "C3488414315-ASF"}, - { "collection": "SENTINEL-1C_SP_META_GRD_MEDIUM", "concept-id": "C3488417229-ASF"}, - { "collection": "SENTINEL-1C_SP_GRD_FULL", "concept-id": "C3488389367-ASF"}, - { "collection": "SENTINEL-1C_SP_META_GRD_FULL", "concept-id": "C3488394269-ASF"}, + { + "collection": "SENTINEL-1C_RAW", + "concept-id": "C3486496642-ASF" + }, + { + "collection": "SENTINEL-1C_SLC", + "concept-id": "C3470873558-ASF" + }, + { + "collection": "SENTINEL-1C_META_SLC", + "concept-id": "C3484561061-ASF" + }, + { + "collection": "SENTINEL-1C_OCN", + "concept-id": "C3484661603-ASF" + }, + { + "collection": "SENTINEL-1C_META_OCN", + "concept-id": "C3484670556-ASF" + }, + { + "collection": "SENTINEL-1C_DP_GRD_HIGH", + "concept-id": "C3486566209-ASF" + }, + { + "collection": "SENTINEL-1C_DP_META_GRD_HIGH", + "concept-id": "C3486580531-ASF" + }, + { + "collection": "SENTINEL-1C_DP_GRD_MEDIUM", + "concept-id": "C3486605959-ASF" + }, + { + "collection": "SENTINEL-1C_DP_META_GRD_MEDIUM", + "concept-id": "C3486616327-ASF" + }, + { + "collection": "SENTINEL-1C_DP_GRD_FULL", + "concept-id": "C3486646217-ASF" + }, + { + "collection": "SENTINEL-1C_DP_META_GRD_FULL", + "concept-id": "C3486655250-ASF" + }, + { + "collection": "SENTINEL-1C_SP_GRD_HIGH", + "concept-id": "C3488402208-ASF" + }, + { + "collection": "SENTINEL-1C_SP_META_GRD_HIGH", + "concept-id": "C3488406939-ASF" + }, + { + "collection": "SENTINEL-1C_SP_GRD_MEDIUM", + "concept-id": "C3488414315-ASF" + }, + { + "collection": "SENTINEL-1C_SP_META_GRD_MEDIUM", + "concept-id": "C3488417229-ASF" + }, + { + "collection": "SENTINEL-1C_SP_GRD_FULL", + "concept-id": "C3488389367-ASF" + }, + { + "collection": "SENTINEL-1C_SP_META_GRD_FULL", + "concept-id": "C3488394269-ASF" + }, ], "SMAP": [ { diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index de22de0f..aeb1b975 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -126,7 +126,7 @@ "C3488414315-ASF", "C3488417229-ASF", "C3488389367-ASF", - "C3488394269-ASF" + "C3488394269-ASF", ], "OPERA-S1": [ "C2777443834-ASF", From 1ad54dd6367d30b702f73b4fa67415d2f817d68f Mon Sep 17 00:00:00 2001 From: tcchase Date: Wed, 23 Apr 2025 10:17:54 -0400 Subject: [PATCH 03/11] chore: codefactor fixes --- SearchAPI/CMR/SubQuery.py | 2 +- SearchAPI/CMR/Translate/input_fixer.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py index 10766cd1..9000c22e 100644 --- a/SearchAPI/CMR/SubQuery.py +++ b/SearchAPI/CMR/SubQuery.py @@ -60,7 +60,7 @@ def combine_params(self, params, extra_params): return final def should_use_asf_frame(self): - asf_frame_platforms = ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C' 'ALOS'] + asf_frame_platforms = ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C', 'ALOS'] asf_frame_datasets = ['SENTINEL-1', 'OPERA-S1', 'SLC-BURST', 'ALOS PALSAR', 'ALOS AVNIR-2', 'ALOS-2', 'NISAR'] asf_frame_collections = [] diff --git a/SearchAPI/CMR/Translate/input_fixer.py b/SearchAPI/CMR/Translate/input_fixer.py index 9828cd22..3dd72fc0 100644 --- a/SearchAPI/CMR/Translate/input_fixer.py +++ b/SearchAPI/CMR/Translate/input_fixer.py @@ -112,7 +112,6 @@ def input_fixer(params, is_prod: bool = False, provider: str = "ASF"): else: if ((p.upper() in plat_names and p.upper() in ['SA', 'SB', 'SC']) or p.upper() in ['SENTINEL-1A', 'SENTINEL-1B', 'SENTINEL-1C']) and any_processing_level: if p.upper() in plat_names and p.upper() in ['SA', 'SB', 'SC']: - to_collections collection_list.extend([id_by_platform['concept-id'] for id_by_platform in to_collections[plat_names[p.upper()]]]) else: collection_list.extend([id_by_platform['concept-id'] for id_by_platform in to_collections[p.upper()]]) From f8b22f9e30c9d1734a5e9c9dc2809a05d21eda08 Mon Sep 17 00:00:00 2001 From: tcchase Date: Wed, 23 Apr 2025 11:20:03 -0400 Subject: [PATCH 04/11] fix: platform values for testing --- yml_tests/test_url_manager.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yml_tests/test_url_manager.py b/yml_tests/test_url_manager.py index 3f865e53..48e28723 100644 --- a/yml_tests/test_url_manager.py +++ b/yml_tests/test_url_manager.py @@ -621,6 +621,7 @@ def renameValsToStandard(self, json_dict): del json_dict["Platform"][i] json_dict["Platform"].append("Sentinel-1A") json_dict["Platform"].append("Sentinel-1B") + json_dict["Platform"].append("Sentinel-1C") json_dict["Platform"].append("Sentinel-1 Interferogram (BETA)") # Sentinel-1A elif platform in ["SENTINEL-1A", "SA"]: @@ -630,6 +631,9 @@ def renameValsToStandard(self, json_dict): elif platform in ["SENTINEL-1B", "SB"]: json_dict["Platform"][i] = "Sentinel-1B" json_dict["Platform"].append("Sentinel-1 Interferogram (BETA)") + elif platform in ["SENTINEL-1C", "SC"]: + json_dict["Platform"][i] = "Sentinel-1C" + json_dict["Platform"].append("Sentinel-1 Interferogram (BETA)") # Sir-C elif platform in ["SIR-C"]: del json_dict["Platform"][i] From 8f4d0bf35a0e953279abf33eb0924a31392c57cb Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 09:09:22 -0800 Subject: [PATCH 05/11] remove pytest-forked requirement --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8c2868ef..c505b444 100644 --- a/requirements.txt +++ b/requirements.txt @@ -77,7 +77,7 @@ pyshp==2.1.3 pytest==8.1.1 pytest-automation==3.0.0 pytest-cov==3.0.0 -pytest-forked==1.3.0 +# pytest-forked==1.3.0 pytest-xdist==2.4.0 python-dateutil==2.8.2 python-gitlab==2.10.1 From deeecf88360080de58de5756ed58847f816f8fae Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 09:22:22 -0800 Subject: [PATCH 06/11] bug: remove pytest-xdist pin --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c505b444..629ee4e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -78,7 +78,7 @@ pytest==8.1.1 pytest-automation==3.0.0 pytest-cov==3.0.0 # pytest-forked==1.3.0 -pytest-xdist==2.4.0 +# pytest-xdist==2.4.0 python-dateutil==2.8.2 python-gitlab==2.10.1 python-slugify==5.0.2 From 9a95606f25f7f6a42be32ed7c1f53f572fd9583a Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 09:37:47 -0800 Subject: [PATCH 07/11] bug: specify no build isolation and pep517 --- .github/workflows/reusable-DeployStack-SearchAPI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-DeployStack-SearchAPI.yml b/.github/workflows/reusable-DeployStack-SearchAPI.yml index a5c914b5..b754b156 100644 --- a/.github/workflows/reusable-DeployStack-SearchAPI.yml +++ b/.github/workflows/reusable-DeployStack-SearchAPI.yml @@ -98,15 +98,15 @@ jobs: # to run suite either way. - uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: 3.9 - name: Install pytest requirements if: github.event_name == 'pull_request' run: | sudo apt-get update sudo apt-get install libgdal-dev - python3 -m pip install --no-cache-dir --upgrade pip - python3 -m pip install --no-cache-dir wheel Cython - python3 -m pip install -r requirements.txt --use-deprecated=legacy-resolver + python3 -m pip install --use-pep517 --no-build-isolation --no-cache-dir --upgrade pip + python3 -m pip install --use-pep517 --no-build-isolation --no-cache-dir wheel Cython + python3 -m pip install --use-pep517 --no-build-isolation -r requirements.txt --use-deprecated=legacy-resolver - name: Run Pytest if: github.event_name == 'pull_request' run: | From 9cf05d11b83b4f82cd3bf8e93e8e2846af594a4e Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 09:58:41 -0800 Subject: [PATCH 08/11] bug: pin pip version to 25.0.1 --- .github/workflows/reusable-DeployStack-SearchAPI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-DeployStack-SearchAPI.yml b/.github/workflows/reusable-DeployStack-SearchAPI.yml index b754b156..ea0d4150 100644 --- a/.github/workflows/reusable-DeployStack-SearchAPI.yml +++ b/.github/workflows/reusable-DeployStack-SearchAPI.yml @@ -104,9 +104,9 @@ jobs: run: | sudo apt-get update sudo apt-get install libgdal-dev - python3 -m pip install --use-pep517 --no-build-isolation --no-cache-dir --upgrade pip - python3 -m pip install --use-pep517 --no-build-isolation --no-cache-dir wheel Cython - python3 -m pip install --use-pep517 --no-build-isolation -r requirements.txt --use-deprecated=legacy-resolver + python3 -m pip install --no-cache-dir --upgrade pip==25.0.1 + python3 -m pip install --no-cache-dir wheel Cython + python3 -m pip install -r requirements.txt --use-deprecated=legacy-resolver - name: Run Pytest if: github.event_name == 'pull_request' run: | From 0941c8455d11420922340d1859914be23b7d54d8 Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 10:13:18 -0800 Subject: [PATCH 09/11] bug: upgrade pytest version --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 629ee4e0..f8a96d90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -apipkg==2.1.0 +# apipkg==2.1.0 argcomplete==1.12.3 asn1crypto==1.4.0 atomicwrites==1.4.0 @@ -74,7 +74,7 @@ pykml==0.2.0 pyparsing==2.4.7 pyproj==3.6.0 pyshp==2.1.3 -pytest==8.1.1 +pytest==8.3.5 pytest-automation==3.0.0 pytest-cov==3.0.0 # pytest-forked==1.3.0 From 182d52cf49ae3b2d53761f3494d9a8b53763d3ec Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 10:20:39 -0800 Subject: [PATCH 10/11] bug: revert pytest version upgrade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f8a96d90..861998cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -74,7 +74,7 @@ pykml==0.2.0 pyparsing==2.4.7 pyproj==3.6.0 pyshp==2.1.3 -pytest==8.3.5 +pytest==8.1.1 pytest-automation==3.0.0 pytest-cov==3.0.0 # pytest-forked==1.3.0 From 6fdeee01ecd51d0555c3d3860b2c3ba55de6bb2d Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 29 Apr 2025 10:28:34 -0800 Subject: [PATCH 11/11] bug: re-add commented dependencies --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 861998cf..8c2868ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -# apipkg==2.1.0 +apipkg==2.1.0 argcomplete==1.12.3 asn1crypto==1.4.0 atomicwrites==1.4.0 @@ -77,8 +77,8 @@ pyshp==2.1.3 pytest==8.1.1 pytest-automation==3.0.0 pytest-cov==3.0.0 -# pytest-forked==1.3.0 -# pytest-xdist==2.4.0 +pytest-forked==1.3.0 +pytest-xdist==2.4.0 python-dateutil==2.8.2 python-gitlab==2.10.1 python-slugify==5.0.2