Merge pull request #580 from ngageoint/integration/1.3.60

Merge integration/1.3.60 into master

Author: pressler-vsc

CHANGELOG.md

@@ -4,6 +4,21 @@ SarPy follows a continuous release process, so there are fairly frequent release
 Since essentially every (squash merge) commit corresponds to a release, specific 
 release points are not being annotated in GitHub.
 
+## [1.3.60] - 2025-01-24
+### Added
+- Support for file objects in `sarpy.io.phase_history.converter.open_phase_history`
+### Fixed
+- Typo in SIDD 2.0+ DigitalElevationData/Geoposition/CoordinateSystemType enum (GGS -> GCS)
+- Account for timezones in generated datetimes
+- SIDD ProductProcessing handling
+- NITF attachment level interpretation
+- Enable TREElement.to_dict() to handle floating-point values
+- Consider implicit edges in certain `sarpy/processing/ortho_rectify` bounds calculations
+- Restored missing antenna beam footprints in some KMZs
+- Handle reading Sentinel-1 SLC files without noiseAzimuthVectors
+### Removed
+- Dropped support for Python 3.6 and 3.7
+
 ## [1.3.59] - 2024-10-03
 ### Added
 - `noxfile.py`

README.md

@@ -148,7 +148,7 @@ package update mechanism, while `python setup.py install` **does not**.
 Issues and Bugs
 ---------------
 Support for Python 2 has been dropped. The core sarpy functionality has been 
-tested for Python 3.6, 3.7, 3.8, 3.9, 3.10, and 3.11. 
+tested for Python 3.8, 3.9, 3.10, 3.11, 3.12.
 
 Changes to sarpy for the sole purpose of supporting a Python version beyond 
 end-of-life are unlikely to be considered.

noxfile.py

@@ -8,7 +8,7 @@
 
 import nox
 
-_PYTHON_VERSIONS = ['3.6', '3.11']
+_PYTHON_VERSIONS = ['3.8', '3.12']
 _LOCATIONS = ["tests"]
 
 

sarpy/__about__.py

@@ -27,7 +27,7 @@
            '__license__', '__copyright__']
 
 from sarpy.__details__ import __classification__, _post_identifier
-_version_number = '1.3.59'
+_version_number = '1.3.60'
 
 __version__ = _version_number + _post_identifier
 

sarpy/_extensions.py

@@ -0,0 +1,31 @@
+__classification__ = "UNCLASSIFIED"
+
+import importlib.metadata
+
+
+def entry_points(*, group):
+    """
+    Simple wrapper around importlib.metadata.entry_points
+
+    Parameters
+    ----------
+    group : str
+        entry point group name
+
+    Returns
+    -------
+    list of entry points belonging to group
+
+    Notes
+    -----
+    This function is only needed to support Python < 3.10.
+    importlib.metadata was introduced in Python 3.8 as a provisional module.
+    The stable interface was introduced in Python 3.10 and the original interface was removed in 3.12.
+    """
+
+    eps = importlib.metadata.entry_points()
+    if hasattr(eps, 'select'):
+        # Python >= 3.10
+        return eps.select(group=group)
+    else:
+        return eps.get(group, [])

sarpy/io/complex/csk.py

@@ -16,6 +16,7 @@
 from numpy.polynomial import polynomial
 from scipy.constants import speed_of_light
 
+import sarpy._extensions
 from sarpy.compliance import bytes_to_string
 from sarpy.io.complex.base import SICDTypeReader
 from sarpy.io.complex.sicd_elements.blocks import Poly1DType, Poly2DType, RowColType
@@ -40,11 +41,6 @@
 from sarpy.io.general.utils import get_seconds, parse_timestring, is_file_like, is_hdf5, h5py
 from sarpy.io.complex.utils import fit_time_coa_polynomial, fit_position_xvalidation
 
-try:
-    from sarpy.io.complex import csk_addin
-except ImportError:
-    csk_addin = None
-
 logger = logging.getLogger(__name__)
 
 _unhandled_id_text = 'Unhandled mission id `{}`'
@@ -62,6 +58,22 @@ def _extract_attrs(h5_element, out=None):
     return out
 
 
+def load_addin():
+    """Check for a CSK addin module"""
+    try:
+        from sarpy.io.complex import csk_addin
+        return csk_addin
+    except ImportError:
+        pass
+
+    eps = sarpy._extensions.entry_points(group='sarpy.io.complex.csk')
+    if not eps:
+        return None
+    if len(eps) > 1:
+        raise RuntimeError("More than one CSK addin found")
+    return list(eps)[0].load()
+
+
 ###########
 # parser and interpreter for hdf5 attributes
 
@@ -562,6 +574,7 @@ def update_rma_and_grid(sicd: SICDType, band_name: str) -> None:
             sicd.Grid.TimeCOAPoly = fit_time_coa_polynomial(
                 sicd.RMA.INCA, sicd.ImageData, sicd.Grid, dop_rate_poly_rg_shifted, poly_order=2)
 
+            csk_addin = load_addin()
             if csk_addin is not None:
                 csk_addin.check_sicd(sicd, self.mission_id, h5_dict)
 

sarpy/io/complex/naming/utils.py

@@ -10,6 +10,9 @@
 from importlib import import_module
 from datetime import datetime
 
+import sarpy._extensions
+
+
 logger = logging.getLogger(__name__)
 
 ###########
@@ -58,6 +61,9 @@ def parse_name_functions():
         if hasattr(sub_module, 'get_commercial_id'):
             register_name_function(sub_module.get_commercial_id)
 
+    for entry in sarpy._extensions.entry_points(group='sarpy.io.complex.naming.get_commercial_id'):
+        register_name_function(entry.load())
+
 
 def get_sicd_name(the_sicd, product_number=1):
     """

sarpy/io/complex/radarsat.py

@@ -20,6 +20,7 @@
 
 from sarpy.geometry.geocoords import geodetic_to_ecf
 
+import sarpy._extensions
 from sarpy.io.complex.base import SICDTypeReader
 from sarpy.io.complex.other_nitf import ComplexNITFReader
 from sarpy.io.complex.sicd_elements.blocks import Poly1DType, Poly2DType
@@ -70,6 +71,22 @@ def _format_class_str(class_str: str) -> str:
         return class_str
 
 
+def load_addin():
+    """Check for a Radarsat addin module"""
+    try:
+        from sarpy.io.complex import radarsat_addin
+        return radarsat_addin
+    except ImportError:
+        pass
+
+    eps = sarpy._extensions.entry_points(group='sarpy.io.complex.radarsat')
+    if not eps:
+        return None
+    if len(eps) > 1:
+        raise RuntimeError("More than one Radarsat addin found")
+    return list(eps)[0].load()
+
+
 def _validate_segment_and_sicd(
         the_sicd: SICDType,
         data_segment: DataSegment,
@@ -535,10 +552,7 @@ def _get_sicd_collection_info(self, start_time: numpy.datetime64) -> Tuple[dict,
         collection_info : CollectionInfoType
         """
 
-        try:
-            import sarpy.io.complex.radarsat_addin as radarsat_addin
-        except ImportError:
-            radarsat_addin = None
+        radarsat_addin = load_addin()
 
         collector_name = self.satellite
         start_time_dt = start_time.astype(datetime)

sarpy/io/complex/sentinel.py

@@ -979,15 +979,18 @@ def populate_noise(sicd, index):  # type: (SICDType, int) -> None
         if root_node.find('./noiseVectorList') is not None:
             # probably prior to March 2018
             range_line, range_pixel, range_noise = extract_vector('noise')
-            azimuth_line, azimuth_pixel, azimuth_noise = None, None, None
         else:
             # noiseRange and noiseAzimuth fields began in March 2018
             range_line, range_pixel, range_noise = extract_vector('noiseRange')
+        # NB: range_line is actually a list of 1 element arrays - probably should have been parsed better
+        range_line = numpy.concatenate(range_line, axis=0)
+
+        if root_node.find('./noiseAzimuthVectorList/noiseAzimuthVector') is not None:
             azimuth_line, azimuth_pixel, azimuth_noise = extract_vector('noiseAzimuth')
             azimuth_line = numpy.concatenate(azimuth_line, axis=0)
+        else:
+            azimuth_line, azimuth_pixel, azimuth_noise = None, None, None
 
-        # NB: range_line is actually a list of 1 element arrays - probably should have been parsed better
-        range_line = numpy.concatenate(range_line, axis=0)
         for ind, sic in enumerate(sicds):
             populate_noise(sic, ind)
 

sarpy/io/complex/sicd.py

@@ -8,7 +8,7 @@
 
 import re
 import logging
-from datetime import datetime
+import datetime
 from typing import BinaryIO, Union, Optional, Dict, Tuple, Sequence
 
 import numpy
@@ -475,15 +475,17 @@ def validate_sicd_for_writing(sicd_meta: SICDType) -> SICDType:
     sicd_meta = sicd_meta.copy()
 
     profile = '{} {}'.format(__title__, __version__)
+    # use naive datetime because numpy warns about parsing timezone aware
+    now = numpy.datetime64(datetime.datetime.now(tz=datetime.timezone.utc).replace(tzinfo=None))
     if sicd_meta.ImageCreation is None:
         sicd_meta.ImageCreation = ImageCreationType(
             Application=profile,
-            DateTime=numpy.datetime64(datetime.now()),
+            DateTime=now,
             Profile=profile)
     else:
         sicd_meta.ImageCreation.Profile = profile
         if sicd_meta.ImageCreation.DateTime is None:
-            sicd_meta.ImageCreation.DateTime = numpy.datetime64(datetime.now())
+            sicd_meta.ImageCreation.DateTime = now
     return sicd_meta