From 7e7dace7bef07efb8e7fa01a96f447a4ccdfc989 Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 13 Jan 2025 09:29:39 -0900 Subject: [PATCH] housekeeping: update setup.py, changelog, fixes unmerged comment conflict --- CHANGELOG.md | 3 ++- asf_search/ASFProduct.py | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a6a49e..e038a696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [v8.1.0](https://github.com/asfadmin/Discovery-asf_search/compare/v8.0.1...v8.1.0) ### Changed - Changed log level from warning to debug/info for search timing log messages +- Raised minimum Python version to 3.9 from 3.8, which reached EOL last year (see the official [Status of Python versions](https://devguide.python.org/versions/) for the Python version release cycle) ------ ## [v8.0.1](https://github.com/asfadmin/Discovery-asf_search/compare/v8.0.0...v8.0.1) @@ -36,7 +37,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Fixed setting end date timezone when translating search opts to CMR opts ------ -## [v8.0.0](https://github.com/asfadmin/Discovery-asf_search/compare/v7.1.0...v7.2.0) +## [v8.0.0](https://github.com/asfadmin/Discovery-asf_search/compare/v7.1.0...v8.0.0) ### Added - Added `asf.ASFSearchOptions(circle=[lat, long, radius])` search param. Takes list of exactly 3 numbers. - Exposed `asf.validator_map`, which given a ops search param, can be used to look up which method we're going to validate it against. diff --git a/asf_search/ASFProduct.py b/asf_search/ASFProduct.py index b12e31ae..91090f67 100644 --- a/asf_search/ASFProduct.py +++ b/asf_search/ASFProduct.py @@ -121,14 +121,10 @@ def get_classname(cls): - `path`: the expected path in the CMR UMM json granule response as a list - `cast`: (optional): the optional type casting method -<<<<<<< HEAD Defining `_base_properties` in subclasses allows for defining custom properties or overiding existing ones. See `S1Product.get_property_paths()` on how subclasses are expected to combine `ASFProduct._base_properties` with their own separately defined `_base_properties` -======= - Defining `_properties_paths` in subclasses allows for defining custom properties or overiding existing ones. ->>>>>>> master """ def __init__(self, args: Dict = {}, session: ASFSession = ASFSession()):