pycontrails 0.57.0__cp313-cp313-macosx_10_13_x86_64.whl → 0.58.0__cp313-cp313-macosx_10_13_x86_64.whl

pycontrails/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.57.0'
-__version_tuple__ = version_tuple = (0, 57, 0)
+__version__ = version = '0.58.0'
+__version_tuple__ = version_tuple = (0, 58, 0)
 
-__commit_id__ = commit_id = 'g7b8b60b87'
+__commit_id__ = commit_id = 'g142ff7355'

pycontrails/core/aircraft_performance.py

@@ -550,7 +550,7 @@ class AircraftPerformance(Model):
             if self.met is None:
                 cond = np.isnan(u) & np.isnan(v)
             else:
-                met_level_max = self.met.data["level"][-1].item()  # type: ignore[union-attr]
+                met_level_max = self.met.data["level"][-1].item()
                 cond = self.source.level > met_level_max
 
             # We DON'T overwrite the original u and v arrays already attached to the source

pycontrails/core/cache.py

@@ -189,7 +189,7 @@ class DiskCacheStore(CacheStore):
         self,
         cache_dir: str | pathlib.Path | None = None,
         allow_clear: bool = False,
-    ):
+    ) -> None:
         if cache_dir is None:
             # Avoid unnecessary import of platformdirs (called in _get_user_cache_dir)
             cache_dir = os.getenv("PYCONTRAILS_CACHE_DIR") or _get_user_cache_dir()
@@ -461,7 +461,7 @@ class GCPCacheStore(CacheStore):
         timeout: int = 300,
         show_progress: bool = False,
         chunk_size: int = 64 * 262144,
-    ):
+    ) -> None:
         try:
             from google.cloud import storage
         except ModuleNotFoundError as e:

pycontrails/core/fleet.py

@@ -5,12 +5,7 @@ from __future__ import annotations
 import sys
 import warnings
 from collections.abc import Iterable
-from typing import Any, NoReturn
-
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
+from typing import Any, NoReturn, Self
 
 if sys.version_info >= (3, 12):
     from typing import override
@@ -122,7 +117,7 @@ class Fleet(Flight):
         # Set default fl_attrs if not provided
         fl_attrs = fl_attrs or {}
         for flight_id in groups.index:
-            fl_attrs.setdefault(flight_id, {})  # type: ignore[call-overload]
+            fl_attrs.setdefault(flight_id, {})
 
         extra = fl_attrs.keys() - groups.index
         if extra:

pycontrails/core/flight.py

@@ -6,18 +6,13 @@ import enum
 import logging
 import sys
 import warnings
-from typing import TYPE_CHECKING, Any, NoReturn
+from typing import TYPE_CHECKING, Any, NoReturn, Self
 
 if sys.version_info >= (3, 12):
     from typing import override
 else:
     from typing_extensions import override
 
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
-
 
 import numpy as np
 import numpy.typing as npt
@@ -2138,7 +2133,7 @@ def segment_rocd(
     T_correction[:-1] = (air_temperature[:-1] + air_temperature[1:]) / (T_isa[:-1] + T_isa[1:])
     T_correction[-1] = np.nan
 
-    return T_correction * out  # type: ignore[return-value]
+    return T_correction * out
 
 
 def _resample_to_freq_or_time(

pycontrails/core/interpolation.py

@@ -26,57 +26,74 @@ class PycontrailsRegularGridInterpolator(scipy.interpolate.RegularGridInterpolat
 
     This class is a thin wrapper around the
     :class:`scipy.interpolate.RegularGridInterpolator` in order to make typical
-    ``pycontrails`` use-cases more efficient.
+    ``pycontrails`` linear interpolation use-cases more performant:
 
-    #. Avoid ``RegularGridInterpolator`` constructor validation. In :func:`interp`,
-    parameters are carefully crafted to fit into the intended form, thereby making
-    validation unnecessary.
+    #. Avoid ``RegularGridInterpolator`` constructor validation when `method="linear"`.
+       In :func:`interp`, parameters are carefully crafted to fit into the intended form,
+       thereby making validation unnecessary.
     #. Override the :meth:`_evaluate_linear` method with a faster implementation. See
-    the :meth:`_evaluate_linear` docstring for more information.
+       the :meth:`_evaluate_linear` docstring for more information.
 
-    This class should not be used directly. Instead, use the :func:`interp` function.
+    **This class should not be used directly. Instead, use the ``interp`` function.**
 
     .. versionchanged:: 0.40.0
 
         The :meth:`_evaluate_linear` method now uses a Cython implementation. The dtype
         of the output is now consistent with the dtype of the underlying :attr:`values`
 
+    .. versionchanged:: 0.58.0
+
+        Any ``method`` other than ``"linear"`` now uses the
+        :class:`scipy.interpolate.RegularGridInterpolator` implementation. This
+        allows for greater flexibility in the ``method`` parameter.
+
     Parameters
     ----------
     points : tuple[npt.NDArray[np.floating], ...]
         Coordinates of the grid points.
     values : npt.NDArray[np.floating]
         Grid values. The shape of this array must be compatible with the
-        coordinates. An error is raised if the dtype is not ``np.float32``
-        or ``np.float64``.
+        coordinates.
     method : str
         Passed into :class:`scipy.interpolate.RegularGridInterpolator`
     bounds_error : bool
         Passed into :class:`scipy.interpolate.RegularGridInterpolator`
     fill_value : float | np.float64 | None
         Passed into :class:`scipy.interpolate.RegularGridInterpolator`
+
+    See Also
+    --------
+    scipy.interpolate.RegularGridInterpolator
+    interp
     """
 
     def __init__(
         self,
         points: tuple[npt.NDArray[np.floating], ...],
         values: npt.NDArray[np.floating],
+        *,
         method: str,
         bounds_error: bool,
         fill_value: float | np.float64 | None,
-    ):
-        if values.dtype not in (np.float32, np.float64):
-            msg = f"values must be a float array, not {values.dtype}"
-            raise ValueError(msg)
-
+    ) -> None:
+        if method != "linear" or values.dtype not in (np.float32, np.float64):
+            # Slow path: use parent class
+            super().__init__(
+                points,
+                values,
+                method=method,
+                bounds_error=bounds_error,
+                fill_value=fill_value,
+            )
+            return
+
+        # Fast path: no validation
         self.grid = points
         self.values = values
-        # TODO: consider supporting updated tensor-product spline methods
-        # see https://github.com/scipy/scipy/releases/tag/v1.13.0
-        self.method = _pick_method(scipy.__version__, method)
+        self.method = method
         self.bounds_error = bounds_error
         self.fill_value = fill_value
-        self._spline = None
+        self._spline = None  # XXX: setting private attribute on RGI
 
     def _prepare_xi_simple(self, xi: npt.NDArray[np.floating]) -> npt.NDArray[np.bool_]:
         """Run looser version of :meth:`_prepare_xi`.
@@ -103,7 +120,7 @@ class PycontrailsRegularGridInterpolator(scipy.interpolate.RegularGridInterpolat
 
             return np.zeros(xi.shape[0], dtype=bool)
 
-        return self._find_out_of_bounds(xi.T)
+        return self._find_out_of_bounds(xi.T)  # XXX: calling private method on RGI
 
     def __call__(
         self, xi: npt.NDArray[np.floating], method: str | None = None
@@ -130,7 +147,7 @@ class PycontrailsRegularGridInterpolator(scipy.interpolate.RegularGridInterpolat
             return super().__call__(xi, method)
 
         out_of_bounds = self._prepare_xi_simple(xi)
-        xi_indices, norm_distances = rgi_cython.find_indices(self.grid, xi.T)
+        xi_indices, norm_distances = self._find_indices(xi.T)  # XXX: calling private method on RGI
 
         out = self._evaluate_linear(xi_indices, norm_distances)
         return self._set_out_of_bounds(out, out_of_bounds)
@@ -223,45 +240,6 @@ class PycontrailsRegularGridInterpolator(scipy.interpolate.RegularGridInterpolat
         raise ValueError(msg)
 
 
-def _pick_method(scipy_version: str, method: str) -> str:
-    """Select an interpolation method.
-
-    For scipy versions 1.13.0 and later, fall back on legacy implementations
-    of tensor-product spline methods. The default implementations in 1.13.0
-    and later are incompatible with this class.
-
-    Parameters
-    ----------
-    scipy_version : str
-        scipy version (major.minor.patch)
-
-    method : str
-        Interpolation method. Passed into :class:`scipy.interpolate.RegularGridInterpolator`
-        as-is unless ``scipy_version`` is 1.13.0 or later and ``method`` is ``"slinear"``,
-        ``"cubic"``, or ``"quintic"``. In this case, ``"_legacy"`` is appended to ``method``.
-
-    Returns
-    -------
-    str
-        Interpolation method adjusted for compatibility with this class.
-    """
-    if method == "linear":
-        return method
-
-    try:
-        version = scipy_version.split(".")
-        major = int(version[0])
-        minor = int(version[1])
-    except (IndexError, ValueError) as exc:
-        msg = f"Failed to parse major and minor version from {scipy_version}"
-        raise ValueError(msg) from exc
-
-    reimplemented_methods = ["slinear", "cubic", "quintic"]
-    if major > 1 or ((major == 1 and minor >= 13) and method in reimplemented_methods):
-        return method + "_legacy"
-    return method
-
-
 def _floatize_time(
     time: npt.NDArray[np.datetime64], offset: np.datetime64
 ) -> npt.NDArray[np.floating]:
@@ -431,7 +409,7 @@ def interp(
         Include ``indices`` and ``return_indices`` experimental parameters.
         Currently, nan values in ``longitude``, ``latitude``, ``level``, or ``time``
         are always propagated through to the output, regardless of ``bounds_error``.
-        In other words, a ValueError for an out of bounds coordinate is only raised
+        In other words, a ``ValueError`` for an out of bounds coordinate is only raised
         if a non-nan value is out of bounds.
 
     .. versionchanged:: 0.40.0
@@ -480,9 +458,9 @@ def interp(
 
     See Also
     --------
-    - :meth:`MetDataArray.interpolate`
-    - :func:`scipy.interpolate.interpn`
-    - :class:`scipy.interpolate.RegularGridInterpolator`
+    pycontrails.MetDataArray.interpolate
+    scipy.interpolate.interpn
+    scipy.interpolate.RegularGridInterpolator
     """
     if localize:
         coords = {"longitude": longitude, "latitude": latitude, "level": level, "time": time}
@@ -579,7 +557,7 @@ def _linear_interp_with_indices(
     if indices is None:
         assert xi is not None, "xi must be provided if indices is None"
         out_of_bounds = interp._prepare_xi_simple(xi)
-        xi_indices, norm_distances = rgi_cython.find_indices(interp.grid, xi.T)
+        xi_indices, norm_distances = interp._find_indices(xi.T)
         indices = RGIArtifacts(xi_indices, norm_distances, out_of_bounds)
 
     out = interp._evaluate_linear(indices.xi_indices, indices.norm_distances)
@@ -606,7 +584,7 @@ class EmissionsProfileInterpolator:
 
     This class simply wraps :func:`numpy.interp` with fixed values for the
     ``xp`` and ``fp`` arguments. Unlike :class:`xarray.DataArray` interpolation,
-    the `numpy.interp` automatically clips values outside the range of the
+    the :func:`numpy.interp` automatically clips values outside the range of the
     ``xp`` array.
 
     Parameters

pycontrails/core/met.py

@@ -26,15 +26,11 @@ from typing import (
     Any,
     Generic,
     Literal,
+    Self,
     TypeVar,
     overload,
 )
 
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
-
 if sys.version_info >= (3, 12):
     from typing import override
 else:
@@ -211,14 +207,22 @@ class MetBase(ABC, Generic[XArrayType]):
         Raises
         ------
         ValueError
-            If one of the coordinates is not sorted.
+            If one of the coordinates is not sorted or contains duplicate values.
         """
         indexes = self.indexes
-        if not np.all(np.diff(indexes["time"]) > np.timedelta64(0, "ns")):
-            raise ValueError("Coordinate 'time' not sorted. Instantiate with 'copy=True'.")
-        for coord in self.dim_order[:3]:  # exclude time, the 4th dimension
-            if not np.all(np.diff(indexes[coord]) > 0.0):
-                raise ValueError(f"Coordinate '{coord}' not sorted. Instantiate with 'copy=True'.")
+        for coord in self.dim_order:
+            arr = indexes[coord]
+            d = np.diff(arr)
+            zero = np.zeros((), dtype=d.dtype)  # ensure same dtype
+
+            if np.any(d <= zero):
+                if np.any(d == zero):
+                    msg = f"Coordinate '{coord}' contains duplicate values."
+                else:
+                    msg = f"Coordinate '{coord}' not sorted."
+
+                msg += " Instantiate with 'copy=True'."
+                raise ValueError(msg)
 
     def _validate_transpose(self) -> None:
         """Check that data is transposed according to :attr:`dim_order`."""
@@ -271,6 +275,10 @@ class MetBase(ABC, Generic[XArrayType]):
             Auxiliary coordinates (altitude and air_pressure) are now cast to the same
             dtype as the underlying grid data.
 
+        .. versionchanged:: 0.58.0
+
+            Duplicate dimension values are dropped, keeping the first occurrence.
+
 
         Parameters
         ----------
@@ -297,6 +305,18 @@ class MetBase(ABC, Generic[XArrayType]):
         # sortby to ensure each coordinate has ascending order
         self.data = self.data.sortby(list(self.dim_order), ascending=True)
 
+        # Drop any duplicated dimension values
+        indexes = self.indexes
+        for coord in self.dim_order:
+            arr = indexes[coord]
+            d = np.diff(arr)
+            zero = np.zeros((), dtype=d.dtype)  # ensure same dtype
+
+            if np.any(d == zero):
+                # Remove duplicates
+                filt = np.r_[True, d > zero]  # prepend True keeps the first occurrence
+                self.data = self.data.isel({coord: filt})
+
         if not self.is_wrapped:
             # Ensure longitude is contained in interval [-180, 180)
             # If longitude has value at 180, we might not want to shift it?
@@ -1087,7 +1107,7 @@ class MetDataset(MetBase):
             out[key] = da.values.ravel()  # type: ignore[index]
 
         if transfer_attrs:
-            out.attrs.update(self.attrs)  # type: ignore[arg-type]
+            out.attrs.update(self.attrs)
 
         return out
 
@@ -1300,7 +1320,7 @@ class MetDataset(MetBase):
         coords: dict[str, np.ndarray] = {}
         for key, val in input_data.items():
             dtype = "datetime64[ns]" if key == "time" else COORD_DTYPE
-            arr: np.ndarray = np.asarray(val, dtype=dtype)  # type: ignore[call-overload]
+            arr: np.ndarray = np.asarray(val, dtype=dtype)
 
             if arr.ndim == 0:
                 arr = arr.reshape(1)
@@ -1889,7 +1909,7 @@ class MetDataArray(MetBase):
         if not self.binary:
             raise NotImplementedError("proportion method is only implemented for binary fields")
 
-        return self.data.sum().values.item() / self.data.count().values.item()  # type: ignore[operator]
+        return self.data.sum().values.item() / self.data.count().values.item()
 
     def find_edges(self) -> Self:
         """Find edges of regions.
@@ -2598,9 +2618,9 @@ def _extract_2d_arr_and_altitude(
     except KeyError:
         altitude = None
     else:
-        altitude = round(altitude)  # type: ignore[call-overload]
+        altitude = round(altitude)
 
-    return arr, altitude  # type: ignore[return-value]
+    return arr, altitude
 
 
 def downselect(data: XArrayType, bbox: tuple[float, ...]) -> XArrayType:

pycontrails/core/polygon.py

@@ -238,7 +238,7 @@ def _contours_to_polygons(
                 latitude=latitude,
                 precision=precision,
                 buffer=buffer,
-                i=child_i,  # type: ignore[arg-type]
+                i=child_i,
             )
 
             candidate = shapely.Polygon(polygon.exterior, [h.exterior for h in holes])
@@ -354,11 +354,11 @@ def find_multipolygon(
         return shapely.MultiPolygon()
 
     assert len(hierarchy) == 1
-    hierarchy = hierarchy[0]  # type: ignore[index]
+    hierarchy = hierarchy[0]
 
     polygons = _contours_to_polygons(
         contours,  # type: ignore[arg-type]
-        hierarchy,  # type: ignore[arg-type]
+        hierarchy,
         min_area,
         convex_hull,
         epsilon,

pycontrails/core/vector.py

@@ -8,12 +8,7 @@ import logging
 import sys
 import warnings
 from collections.abc import Generator, Iterable, Iterator, Sequence
-from typing import Any, overload
-
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
+from typing import Any, Self, overload
 
 if sys.version_info >= (3, 12):
     from typing import override
@@ -315,7 +310,7 @@ class VectorDataset:  # noqa: PLW1641
         # Set attributes: always shallow copy
         # -----------------------------------
 
-        self.attrs = AttrDict(attrs or {})  # type: ignore[arg-type]
+        self.attrs = AttrDict(attrs or {})
         self.attrs.update(attrs_kwargs)
 
     @classmethod
@@ -1389,7 +1384,7 @@ class GeoVectorDataset(VectorDataset):
         ):
             keys = *self.required_keys, "altitude"
             self.data = VectorDataDict(_empty_vector_dict(keys))
-            self.attrs = AttrDict(attrs or {})  # type: ignore[arg-type]
+            self.attrs = AttrDict(attrs or {})
             self.attrs.update(attrs_kwargs)
             return
 

pycontrails/datalib/_met_utils/metsource.py

@@ -175,16 +175,13 @@ def parse_pressure_levels(
 
     out = arr.tolist()
     if supported is None:
-        return out  # type: ignore[return-value]
+        return out
 
-    if missing := set(out).difference(supported):  # type: ignore[arg-type]
-        msg = (
-            f"Pressure levels {sorted(missing)} are not supported. "  # type: ignore[type-var]
-            f"Supported levels: {supported}"
-        )
+    if missing := set(out).difference(supported):
+        msg = f"Pressure levels {sorted(missing)} are not supported. Supported levels: {supported}"
         raise ValueError(msg)
 
-    return out  # type: ignore[return-value]
+    return out
 
 
 def parse_variables(variables: VariableInput, supported: list[MetVariable]) -> list[MetVariable]:

pycontrails/datalib/ecmwf/common.py

@@ -61,14 +61,14 @@ class ECMWFAPI(metsource.MetDataSource):
 
         # downselect times
         if not self.timesteps:
-            self.timesteps = ds["time"].values.astype("datetime64[ns]").tolist()  # type: ignore[assignment]
+            self.timesteps = ds["time"].values.astype("datetime64[ns]").tolist()
         else:
             try:
                 ds = ds.sel(time=self.timesteps)
             except KeyError as exc:
                 # this snippet shows the missing times for convenience
                 np_timesteps = {np.datetime64(t, "ns") for t in self.timesteps}
-                missing_times = sorted(np_timesteps.difference(ds["time"].values))  # type: ignore[type-var]
+                missing_times = sorted(np_timesteps.difference(ds["time"].values))
                 msg = f"Input dataset is missing time coordinates {[str(t) for t in missing_times]}"
                 raise KeyError(msg) from exc
 

pycontrails/datalib/ecmwf/hres.py

@@ -708,7 +708,7 @@ class HRES(ECMWFAPI):
 
         # set forecast time if it's not defined (this occurs when only the paths param is provided)
         if not hasattr(self, "forecast_time"):
-            self.forecast_time = ds["time"].values.astype("datetime64[s]").tolist()  # type: ignore[assignment]
+            self.forecast_time = ds["time"].values.astype("datetime64[s]").tolist()
 
         # check that forecast_time is correct if defined
         # note the "time" coordinate here is the HRES forecast_time
@@ -723,7 +723,7 @@ class HRES(ECMWFAPI):
         # set timesteps if not defined
         # note that "time" is now the actual timestep coordinates
         if not self.timesteps:
-            self.timesteps = ds["time"].values.astype("datetime64[s]").tolist()  # type: ignore[assignment]
+            self.timesteps = ds["time"].values.astype("datetime64[s]").tolist()
 
         self.cache_dataset(ds)
 

pycontrails/datalib/ecmwf/ifs.py

@@ -149,7 +149,7 @@ class IFS(metsource.MetDataSource):
         else:
             # set timesteps from dataset "time" coordinates
             # np.datetime64 doesn't covert to list[datetime] unless its unit is us
-            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()  # type: ignore[assignment]
+            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()
 
         # downselect hyam/hybm coefficients by the "lev" coordinate
         # (this is a 1-indexed verison of nhym)

pycontrails/datalib/gfs/gfs.py

@@ -595,7 +595,7 @@ class GFSForecast(metsource.MetDataSource):
         else:
             # set timesteps from dataset "time" coordinates
             # np.datetime64 doesn't covert to list[datetime] unless its unit is us
-            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()  # type: ignore[assignment]
+            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()
 
         # if "level" is not in dims and
         # length of the requested pressure levels is 1

pycontrails/datalib/himawari/header_struct.py

@@ -205,7 +205,7 @@ HEADER_STRUCT_SCHEMA: dict[int, _HeaderBlock] = {
 }
 
 
-def parse_himawari_header(content: bytes) -> dict:
+def parse_himawari_header(content: bytes) -> dict[str, dict[str, Any]]:
     """Parse the Himawari header data.
 
     Skips variable-length fields and spares.

pycontrails/datalib/himawari/himawari.py

@@ -160,7 +160,10 @@ def _extract_band_from_rpath(rpath: str) -> str:
     return f"B{suffix[:2]}"  # B??
 
 
-def _mask_invalid(data: npt.NDArray[np.uint16], calib_info: dict) -> npt.NDArray[np.float32]:
+def _mask_invalid(
+    data: npt.NDArray[np.uint16],
+    calib_info: dict[str, Any],
+) -> npt.NDArray[np.float32]:
     """Mask invalid data."""
     error_pixel = calib_info["count_error_pixels"]
     outside_pixel = calib_info["count_outside_scan_area"]
@@ -218,7 +221,9 @@ def _counts_to_radiance(
     return counts * gain + const
 
 
-def _load_image_data(content: bytes, metadata: dict) -> npt.NDArray[np.float32]:
+def _load_image_data(
+    content: bytes, metadata: dict[str, dict[str, Any]]
+) -> npt.NDArray[np.float32]:
     counts = _load_raw_counts(content, metadata)
 
     calib_info = metadata["calibration_information"]
@@ -230,7 +235,10 @@ def _load_image_data(content: bytes, metadata: dict) -> npt.NDArray[np.float32]:
     return _radiance_to_brightness_temperature(radiance, calib_info)
 
 
-def _ahi_fixed_grid(proj_info: dict, arr: np.ndarray) -> tuple[xr.DataArray, xr.DataArray]:
+def _ahi_fixed_grid(
+    proj_info: dict[str, Any],
+    arr: np.ndarray,
+) -> tuple[xr.DataArray, xr.DataArray]:
     n_lines, n_columns = arr.shape
 
     i = np.arange(n_columns, dtype=np.float32)
@@ -277,7 +285,11 @@ def _himawari_proj4_string(proj_info: dict[str, Any]) -> str:
     return f"+proj=geos +h={h} +a={a} +b={b} +lon_0={lon} +sweep=x +units=m +no_defs"
 
 
-def _earth_disk_mask(proj_info: dict, x: xr.DataArray, y: xr.DataArray) -> npt.NDArray[np.bool_]:
+def _earth_disk_mask(
+    proj_info: dict[str, Any],
+    x: xr.DataArray,
+    y: xr.DataArray,
+) -> npt.NDArray[np.bool_]:
     """Return a boolean mask where True indicates pixels over the Earth disk."""
     a = proj_info["equatorial_radius"] * 1000.0  # km -> m
     b = proj_info["polar_radius"] * 1000.0  # km -> m
@@ -301,7 +313,7 @@ def _earth_disk_mask(proj_info: dict, x: xr.DataArray, y: xr.DataArray) -> npt.N
     return discriminant >= 0.0
 
 
-def _parse_start_time(metadata: dict) -> datetime.datetime:
+def _parse_start_time(metadata: dict[str, dict[str, Any]]) -> datetime.datetime:
     """Parse the start time from the metadata."""
     mjd_value = metadata["basic_information"]["obs_start_time"]
     mjd_epoch = datetime.datetime(1858, 11, 17)
@@ -355,9 +367,10 @@ def _parse_s3_raw_data(raw_data: list[bytes]) -> xr.DataArray:
 
 
 class Himawari:
-    """Support for Himawari-8/9 satellite data accessed via AWS S3.
+    """Support for Himawari-8/9 satellite data access via AWS S3.
 
-    This interface requires the ``s3fs`` package.
+    This interface requires the ``s3fs`` package to download data from the
+    `AWS Public Dataset <https://registry.opendata.aws/himawari/>`_.
 
     Parameters
     ----------

pycontrails/datalib/leo_utils/sentinel_metadata.py

@@ -1,10 +1,10 @@
 """Download and parse Sentinel metadata."""
 
+import datetime
 import os
 import re
 import xml.etree.ElementTree as ET
 from collections.abc import Collection
-from datetime import datetime, timedelta, timezone
 
 import numpy as np
 import numpy.typing as npt
@@ -464,10 +464,10 @@ def parse_ephemeris_sentinel(datatsrip_metadata_path: str) -> pd.DataFrame:
                 if position_elem is None or position_elem.text is None:
                     continue  # skip if missing
 
-                gps_time = datetime.strptime(gps_time_elem.text, "%Y-%m-%dT%H:%M:%S")
+                gps_time = datetime.datetime.strptime(gps_time_elem.text, "%Y-%m-%dT%H:%M:%S")
 
                 # Convert GPS to UTC time as there is a few seconds between them
-                utc_time = gps_to_utc(gps_time).replace(tzinfo=timezone.utc)
+                utc_time = gps_to_utc(gps_time).replace(tzinfo=datetime.UTC)
 
                 # Parse positions in ECEF coordinate system
                 x, y, z = map(float, position_elem.text.split())
@@ -643,30 +643,30 @@ def get_time_delay_detectors(
 # Time helper functions
 
 
-def gps_to_utc(gps_time: datetime) -> datetime:
+def gps_to_utc(gps_time: datetime.datetime) -> datetime.datetime:
     """Convert GPS time (datetime object) to UTC time.
 
     https://gssc.esa.int/navipedia/index.php/Transformations_between_Time_Systems
     """
 
-    gps_tai_offset = timedelta(seconds=19)
-    utc_tai_offset = timedelta(seconds=37)
+    gps_tai_offset = datetime.timedelta(seconds=19)
+    utc_tai_offset = datetime.timedelta(seconds=37)
 
     # Convert GPS time to UTC
     return gps_time + gps_tai_offset - utc_tai_offset
 
 
-def _calculate_average_time(times: Collection[datetime]) -> datetime:
+def _calculate_average_time(times: Collection[datetime.datetime]) -> datetime.datetime:
     """Return the average time from a list of times."""
     # Compute the average time
     avg_timestamp = sum(t.timestamp() for t in times) / len(times)
-    return datetime.fromtimestamp(avg_timestamp)
+    return datetime.datetime.fromtimestamp(avg_timestamp)
 
 
 def _calculate_timedeltas(detector_times: dict[int, str]) -> dict[int, pd.Timedelta]:
     """Calculate the time difference between a detector and the average time."""
     detector_times_dt = {
-        detector_id: datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S.%f")
+        detector_id: datetime.datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%S.%f")
         for detector_id, time_str in detector_times.items()
     }
 

pycontrails/ext/synthetic_flight.py

@@ -305,8 +305,8 @@ class SyntheticFlight:
             *src,
             az,
             npts,
-            m_per_timestep,  # type: ignore
-            return_back_azimuth=False,  # type: ignore
+            m_per_timestep,
+            return_back_azimuth=False,
         )
         longitude = np.asarray(result.lons)
         latitude = np.asarray(result.lats)

pycontrails/models/cocip/cocip_uncertainty.py

@@ -30,7 +30,7 @@ class habit_dirichlet(rv_frozen):
     - Table 2 in :cite:`schumannEffectiveRadiusIce2011`
     """
 
-    def __init__(self, C: float = 96.0):
+    def __init__(self, C: float = 96.0) -> None:
         self.C = C
 
     def rvs(self, *args: Any, **kwds: Any) -> npt.NDArray[np.float32]:

pycontrails/models/cocip/contrail_properties.py

@@ -236,7 +236,7 @@ def initial_ice_particle_number(
         phase, [:math:`# m^{-1}`]
     """
     if min_aei is not None:
-        aei = np.clip(aei, min=min_aei)  # type: ignore[arg-type,call-overload]
+        aei = np.clip(aei, min=min_aei)  # type: ignore[call-overload]
     return fuel_dist * aei
 
 

pycontrails/models/cocip/output_formats.py

@@ -2228,7 +2228,7 @@ def compare_cocip_with_goes(
     fig = plt.figure(figsize=(1.2 * x_dim, y_dim))
     pc = ccrs.PlateCarree()
     ax = fig.add_subplot(projection=pc, extent=bbox)
-    ax.coastlines()  # type: ignore[attr-defined]
+    ax.coastlines()
     ax.imshow(rgb, extent=extent, transform=transform)
 
     ax.set_xticks([spatial_bbox[0], spatial_bbox[2]], crs=ccrs.PlateCarree())

pycontrails/models/cocipgrid/cocip_grid.py

@@ -114,7 +114,7 @@ class CocipGrid(models.Model):
         rad: MetDataset,
         params: dict[str, Any] | None = None,
         **params_kwargs: Any,
-    ):
+    ) -> None:
         super().__init__(met, params=params, **params_kwargs)
 
         compute_tau_cirrus = self.params["compute_tau_cirrus_in_model_init"]
@@ -386,7 +386,7 @@ class CocipGrid(models.Model):
             "dt_integration": dt_integration_str,
             "aircraft_type": self.get_source_param("aircraft_type"),
             "pycontrails_version": pycontrails.__version__,
-            **self.source.attrs,  # type: ignore[dict-item]
+            **self.source.attrs,
         }
         if ap_model := self.params["aircraft_performance"]:
             attrs["ap_model"] = type(ap_model).__name__
@@ -2210,7 +2210,7 @@ def result_to_metdataset(
     # Update source
     for k, v in data_vars.items():  # type: ignore[assignment]
         source[k] = v
-    source.attrs.update(attrs)  # type: ignore[arg-type]
+    source.attrs.update(attrs)
 
     # Return reference to source
     return source

pycontrails/models/dry_advection.py

@@ -590,7 +590,7 @@ def _evolve_one_step(
         vector,
         dz_m=dz_m,
         dt=dt,  # type: ignore[arg-type]
-        max_depth=max_depth,  # type: ignore[arg-type]
+        max_depth=max_depth,
         verbose_outputs=verbose_outputs,
     )
     out["azimuth"] = azimuth_2

pycontrails/models/extended_k15.py

@@ -24,12 +24,12 @@ DEFAULT_EXHAUST_T = 600.0  # Exhaust temperature, [K]
 EXPERIMENTAL_WARNING = True
 
 
-class ParticleType(enum.Enum):
+class ParticleType(enum.StrEnum):
     """Enumeration of particle types."""
 
-    NVPM = "nvPM"
-    VPM = "vPM"
-    AMBIENT = "ambient"
+    NVPM = enum.auto()
+    VPM = enum.auto()
+    AMBIENT = enum.auto()
 
 
 @dataclasses.dataclass(frozen=True)

pycontrails/models/humidity_scaling/humidity_scaling.py

@@ -442,7 +442,7 @@ class ExponentialBoostLatitudeCorrectionHumidityScaling(HumidityScaling):
         met: MetDataset | None = None,
         params: dict[str, Any] | None = None,
         **params_kwargs: Any,
-    ):
+    ) -> None:
         if (params is None or "level_type" not in params) and ("level_type" not in params_kwargs):
             msg = (
                 "The default level_type will change from 'pressure' to 'model' "
@@ -863,7 +863,7 @@ class HistogramMatching(HumidityScaling):
         met: MetDataset | None = None,
         params: dict[str, Any] | None = None,
         **params_kwargs: Any,
-    ):
+    ) -> None:
         if (params is None or "level_type" not in params) and (
             params_kwargs is None or "level_type" not in params_kwargs
         ):

pycontrails/models/ps_model/ps_grid.py

@@ -639,9 +639,9 @@ def ps_nominal_optimize_mach(
         if sin_a is None or cos_a is None:
             msg = "Segment angles must be provide if wind data is specified"
             raise ValueError(msg)
-        headwind = -(northward_wind * cos_a + eastward_wind * sin_a)  # type: ignore[misc]
+        headwind = -(northward_wind * cos_a + eastward_wind * sin_a)
     else:
-        headwind = 0.0  # type: ignore
+        headwind = 0.0
 
     min_mach = ps_operational_limits.minimum_mach_num(
         air_pressure=level * 100.0,

pycontrails/models/sac.py

@@ -133,7 +133,7 @@ class SAC(Model):
 
         G = slope_mixing_line(specific_humidity, air_pressure, engine_efficiency, ei_h2o, q_fuel)
         T_sat_liquid_ = T_sat_liquid(G)
-        rh_crit_sac = rh_critical_sac(air_temperature, T_sat_liquid_, G)  # type: ignore[type-var]
+        rh_crit_sac = rh_critical_sac(air_temperature, T_sat_liquid_, G)
         rh = thermo.rh(specific_humidity, air_temperature, air_pressure)  # type: ignore[type-var]
         sac_ = sac(rh, rh_crit_sac)
 

pycontrails/models/tau_cirrus.py

@@ -91,7 +91,7 @@ def tau_cirrus(met: MetDataset) -> xr.DataArray:
     # dask.array.gradient expects at least 2 elements in each chunk
     level_axis = geopotential_height.get_axis_num("level")
     if geopotential_height.chunks:
-        level_chunks = geopotential_height.chunks[level_axis]  # type: ignore[call-overload, index]
+        level_chunks = geopotential_height.chunks[level_axis]
         if any(chunk < 2 for chunk in level_chunks):
             geopotential_height = geopotential_height.chunk(level=-1)
 

pycontrails/physics/thermo.py

@@ -269,7 +269,7 @@ def mk05_e_sat_liquid_prime(T: ArrayScalarLike) -> ArrayScalarLike:
         Derivative of :func:`mk05_e_sat_liquid`
     """
     tanh_term = np.tanh(0.0415 * (T - 218.8))
-    return mk05_e_sat_liquid(T) * (  # type: ignore[return-value]
+    return mk05_e_sat_liquid(T) * (
         6763.22 / T**2
         - 4.21 / T
         + 0.000367

pycontrails/utils/iteration.py

@@ -6,7 +6,7 @@ from collections.abc import Iterator
 from typing import Any
 
 
-def chunk_list(lst: list, n: int) -> Iterator[list[Any]]:
+def chunk_list(lst: list[Any], n: int) -> Iterator[list[Any]]:
     """Yield successive n-sized chunks from list."""
 
     for i in range(0, len(lst), n):

{pycontrails-0.57.0.dist-info → pycontrails-0.58.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.57.0
+Version: 0.58.0
 Summary: Python library for modeling aviation climate impacts
 Author-email: "Contrails.org" <py@contrails.org>
 License-Expression: Apache-2.0
@@ -13,23 +13,23 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: GIS
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: dask>=2022.3
 Requires-Dist: numpy>=1.22
 Requires-Dist: pandas>=2.0
-Requires-Dist: scipy>=1.10
+Requires-Dist: scipy>=1.12
 Requires-Dist: typing-extensions>=4.5; python_version < "3.12"
 Requires-Dist: xarray>=2022.3
 Provides-Extra: complete
@@ -140,7 +140,7 @@ Documentation and examples available at [py.contrails.org](https://py.contrails.
 
 ### Install with pip
 
-You can install pycontrails from PyPI with `pip` (Python 3.10 or later required):
+You can install pycontrails from PyPI with `pip` (Python 3.11 or later required):
 
 ```bash
 $ pip install pycontrails

{pycontrails-0.57.0.dist-info → pycontrails-0.58.0.dist-info}/RECORD

@@ -1,25 +1,25 @@
-pycontrails-0.57.0.dist-info/RECORD,,
-pycontrails-0.57.0.dist-info/WHEEL,sha256=0rn5ODYhsjI3KEHrk9RXNWLZT7Rowo6wA0Jh2iAIJLk,138
-pycontrails-0.57.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.57.0.dist-info/METADATA,sha256=hMlpeGFk6SKCi-56vcSantrPjYPn4lD_eF9LyZaxetE,9129
-pycontrails-0.57.0.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.57.0.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
-pycontrails/_version.py,sha256=nChqOuolnzO53ha9g4Di1DOVXj5DhnPGthV03BPY4tY,714
+pycontrails-0.58.0.dist-info/RECORD,,
+pycontrails-0.58.0.dist-info/WHEEL,sha256=0rn5ODYhsjI3KEHrk9RXNWLZT7Rowo6wA0Jh2iAIJLk,138
+pycontrails-0.58.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.58.0.dist-info/METADATA,sha256=-pOZxATs-SGOiS7FppQtQYehP9MYFbQV2l_VnbptyJg,9129
+pycontrails-0.58.0.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.58.0.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails/_version.py,sha256=ife3IDQF-DAoy1CwSUU90Z0xGG9P1GsYeBh-Ic3uecI,714
 pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=mQG1NmULztZjTK7O4waiggiR_4dA7LhTeuyQnLJRHsE,73650
+pycontrails/core/vector.py,sha256=hms3hea2Y86LOuZFfOqzGZToqpOVksgXikM_S5w355w,73498
 pycontrails/core/models.py,sha256=3mDTqp1V5aae9akuYwbMGIUEkESKSYTjZeyu2IiMW7s,43915
-pycontrails/core/interpolation.py,sha256=wovjj3TAf3xonVxjarclpvZLyLq6N7wZQQXsI9hT3YA,25713
-pycontrails/core/fleet.py,sha256=3uRByONZW8yHiS2gmgwOozVm6ksUVdsy6Gyf6jYjSPY,16703
-pycontrails/core/flight.py,sha256=_a4AJjewA_lcW_qjBPga9z6JlVAev-es_M8TFVyX_1E,81590
+pycontrails/core/interpolation.py,sha256=TpLDfx-Bx2tGDjWJOyU4n9Dkz6Obl05dB7Ol5diYdsk,24816
+pycontrails/core/fleet.py,sha256=a_vVwAjMbjkhszg7ejP3V0yly_wJ9Va_OQEATG-9UHw,16572
+pycontrails/core/flight.py,sha256=dmqO1PxADMHIcK9U8XSnuXbP59ftQgeKvdI2xGP04ig,81460
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
-pycontrails/core/polygon.py,sha256=g7YqWzUbOHWT65XrLqLUZLrQXYcx_x1NcJ041-Cj7UY,18070
-pycontrails/core/cache.py,sha256=Zng2edpSKYNyrkD4j1omYMCzJ7Lm762YJnUmqoVu1Z4,28161
+pycontrails/core/polygon.py,sha256=kXYwj1Xy-mo8GEWXFAO_OJEtZbGx11DE_sZw6iyNvN4,17995
+pycontrails/core/cache.py,sha256=JQIy1sQf0Vil7wlEk9ZIvVacnOD4wM3X8-UkMFjR2wQ,28177
 pycontrails/core/__init__.py,sha256=p0O09HxdeXU0X5Z3zrHMlTfXa92YumT3fJ8wJBI5ido,856
-pycontrails/core/rgi_cython.cpython-313-darwin.so,sha256=qnILk5Y3Ggn29xtH8odfBx1A3NM7Zu17SrTVWzZwf14,340752
+pycontrails/core/rgi_cython.cpython-313-darwin.so,sha256=fAgkmk74eiudQSAW4EC-HYOztPMRphPQaXBsc-ZPo-Y,325816
 pycontrails/core/flightplan.py,sha256=0mvA3IO19Sap-7gwpmEIV35_mg6ChvajwhurvjZZt_U,7521
-pycontrails/core/met.py,sha256=O9W6RaEwUsg7ZERR47Q-6fYjg13BzOZtcQdw92444xg,103987
-pycontrails/core/aircraft_performance.py,sha256=Kk_Rb61jDOWPmCQHwn2jR5vMPmB8b3aq1iTWfiUMj9U,28232
+pycontrails/core/met.py,sha256=JosS0DXGEB4NBQ40WU1b4yG04h3DkT7Vs-P0jK-UkCY,104453
+pycontrails/core/aircraft_performance.py,sha256=CPIgIi5nUuCHiNVLAvZcWECRfakmMd-wUWd3lMA6oGM,28204
 pycontrails/core/airports.py,sha256=CzZrgJNZ7wtNv8vg9sJczMhFov7k0gmrGR4tRKCH8i8,6782
 pycontrails/core/met_var.py,sha256=g69vqbxpJeXEQU8vrrcoUR1PX3zCo2-k3au1Lv2TiIw,12027
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
@@ -28,52 +28,52 @@ pycontrails/datalib/landsat.py,sha256=6ylDkAjnyX7b4ZbHn4bprO8HB8ADPFyMkwWehIs8FL
 pycontrails/datalib/geo_utils.py,sha256=w6VYhJQeMpBXaBclqANv4Nn0yqPIxlQr6GTUpjArTj0,9070
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=ed1l1avq8lBvQinY_vNSsWRcpqxUdAPY61AGyPcLawo,23532
-pycontrails/datalib/himawari/himawari.py,sha256=G1YHa3b_l1J0tnk_TOz4dUCn-Q522rT6RR7lS3-NPE8,23120
+pycontrails/datalib/himawari/himawari.py,sha256=uJXhu1URdu3Hen9wMwkgxyPHdjd_xyIt9E7WblVy2xQ,23327
 pycontrails/datalib/himawari/__init__.py,sha256=SWupVbeuyK07IPDCgiNjN6hoLB7hlceabJ3fixhDkl0,619
-pycontrails/datalib/himawari/header_struct.py,sha256=Eu2tf5BXNDkW7VH-bSGCOwnrOiKNv73eCBrY09r0UPo,9954
-pycontrails/datalib/_met_utils/metsource.py,sha256=B4Gd9gkfMMlXe-xc_xcNNZAJ0gOeRelvrBsFyk6tEs4,24151
+pycontrails/datalib/himawari/header_struct.py,sha256=WbPkNBNUVm8tGKU8wpj4rldY17g5MHQ_OfbWicZSokc,9975
+pycontrails/datalib/_met_utils/metsource.py,sha256=mlKcRko5ZKuYK5uwWn6AAgUSJLMQAYq1nFqskVMGgYo,23999
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=7HXQU5S02PzX9Ew2ZrDKSp0tDEG1eeVAvbP3decmm20,12437
 pycontrails/datalib/ecmwf/era5.py,sha256=4ULNdDlUN0kP6Tbp8D_-Bc12nAsLf0iNfZaDoj_AoZU,18952
 pycontrails/datalib/ecmwf/era5_model_level.py,sha256=AO7ePIGZtavx5nQSPYP4p07RNZeg3bbzmoZC7RUC4Gg,19354
-pycontrails/datalib/ecmwf/hres.py,sha256=isRQkybVZyKxVvqpQyGQsMtePFfv_qqAMBQ98wDLYtc,29680
+pycontrails/datalib/ecmwf/hres.py,sha256=tvIXPJjXgijtVdsSyPGtvKf0h5GUczBSsovKEbCgBxg,29624
 pycontrails/datalib/ecmwf/variables.py,sha256=lU3BNe265XVhCXvdMwZqfkWQwtsetZxVRLSfPqHFKAE,9913
 pycontrails/datalib/ecmwf/hres_model_level.py,sha256=CcxMKiFJyLvM9njmBVywAXJxyWE7atsgHXBubKJQqHM,17779
 pycontrails/datalib/ecmwf/__init__.py,sha256=wdfhplEaW2UKTItIoshTtVEjbPyfDYoprTJNxbKZuvA,2021
-pycontrails/datalib/ecmwf/common.py,sha256=qRMSzDQikGMi3uqvz-Y57e3biHPzSoVMfUwOu9iTxHc,4024
+pycontrails/datalib/ecmwf/common.py,sha256=axOxvdrey9YD34uk0Ocav08MxKvC2uVaiwvyQgFZMEw,3970
 pycontrails/datalib/ecmwf/model_levels.py,sha256=_kgpnogaS6MlfvTX9dB5ASTHFUlZuQ_DRb-VADwEa0k,16996
-pycontrails/datalib/ecmwf/ifs.py,sha256=0swHe6tFc5Fbu9e4_jREW0H-xYHYLtxjNoE3aUUlgvc,10761
+pycontrails/datalib/ecmwf/ifs.py,sha256=_1UarorPp9VlgFZc-NnZy8YnfEqBdp7GV1A-ye6JqS8,10733
 pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=PmvGLRzn6uuCKSwiasSuVcehvvmSaqP7cnLuN6hhCQQ,9788
-pycontrails/datalib/gfs/gfs.py,sha256=ROFxCiLudxyMqdSJAVNecKbP1nWZktiRK8Gyjede2wg,22266
+pycontrails/datalib/gfs/gfs.py,sha256=VqS0MRLawgzkBDpjDUYoswXByIy6XUqA9XP7lM1ueBk,22238
 pycontrails/datalib/gfs/variables.py,sha256=4ALR4zhYW8tQVlNVHrd0CK8oRNSe_2OkW3ELeaImtAI,3135
 pycontrails/datalib/gfs/__init__.py,sha256=pXNjb9cJC6ngpuCnoHnmVZ2RHzbHZ0AlsyGvgcdcl2E,684
 pycontrails/datalib/spire/spire.py,sha256=h25BVgSr7E71Ox3-y9WgqFvp-54L08yzb2Ou-iMl7wM,24242
 pycontrails/datalib/spire/__init__.py,sha256=3-My8yQItS6PL0DqXgNaltLqvN6T7nbnNnLD-sy7kt4,186
 pycontrails/datalib/spire/exceptions.py,sha256=U0V_nZTLhxJwrzldvU9PdESx8-zLddRH3FmzkJyFyrI,1714
-pycontrails/datalib/leo_utils/sentinel_metadata.py,sha256=h5ieEwtmeAAtiIBdfOF8HaoE121ba0DrKb7dLvuaAeI,25506
+pycontrails/datalib/leo_utils/sentinel_metadata.py,sha256=UXpv0XPmtQezVfprcFYNlRpV7nherCDW4oKStBZTdT8,25552
 pycontrails/datalib/leo_utils/landsat_metadata.py,sha256=B455-Yq6HTj0Se0dS4c_2F5ZjcATu2yNK1gyoIlgLMg,10628
 pycontrails/datalib/leo_utils/__init__.py,sha256=-SEAc1f7zEbJHcKjgwLuhnIwte9W-ystFNLvfC4RE94,213
 pycontrails/datalib/leo_utils/vis.py,sha256=-fLcm1D5cP6lThVHovV3MJSiadWyTUAvYDMvr4drMU4,1802
 pycontrails/datalib/leo_utils/search.py,sha256=KbHQ2GARacDuUz3zEJuATSga-R32dQFVTqhZgndHUZI,8686
 pycontrails/datalib/leo_utils/correction.py,sha256=cHf4PhHNYMqdVAFYNiTnjcVyqr1vCBMCKi0IjKB_3pw,9564
 pycontrails/datalib/leo_utils/static/bq_roi_query.sql,sha256=xq6-tJyz0-bUwW0KjQymqygjH3WlQBmyBtP7Ci7SBe8,260
-pycontrails/ext/synthetic_flight.py,sha256=wROBQErfr_IhEPndC97fuWbnZQega2Z89VhzoXzZMO8,16802
+pycontrails/ext/synthetic_flight.py,sha256=DdDy1gih8bwdBjsTsvi4mK3lJhcNKlhyllpOWaaASio,16770
 pycontrails/ext/cirium.py,sha256=DFPfRwLDwddpucAPRQhyT4bDGh0VvvoViMUd3pidam8,415
 pycontrails/ext/empirical_grid.py,sha256=FPNQA0x4nVwBXFlbs3DgIapSrXFYhoc8b8IX0M4xhBc,4363
 pycontrails/ext/bada.py,sha256=YlQq4nnFyWza1Am2e2ZucpaICHDuUFRTrtVzIKMzf9s,1091
-pycontrails/utils/iteration.py,sha256=q_vb39VjxRr4hqTyPYko3gK4sboJOJf_Evq6m_2DL-g,319
+pycontrails/utils/iteration.py,sha256=YGcex8pBDegU9dbDJmarxqdPzebAk_Gnc8DK3khY9SY,324
 pycontrails/utils/__init__.py,sha256=Gt_57sBgfliFSxx9sDpuchykFDxmM11Wg9xAeSqPcnI,32
 pycontrails/utils/types.py,sha256=1AaY1x_qGlYAl08xg6PS0MPKm3OZwFBM7xLI_nHK7EY,4869
 pycontrails/utils/temp.py,sha256=lGU0b_R8ze4yKlsOusHIIBaoNFBrmrB3vBjgHRlfcXk,1109
 pycontrails/utils/json.py,sha256=oTiO8xh603esfBGaGVmA5eUzR0NhAqNpQCegMMgnSbg,5896
 pycontrails/utils/dependencies.py,sha256=ATP45xYdUbIyGFzgbOe5SbokMytvB84TcexUEFnEUZE,2559
-pycontrails/models/extended_k15.py,sha256=uZ32wC5HNCJ5M9u4V4x10QoXn2hZRZy1tKcSvNJE0K4,47978
+pycontrails/models/extended_k15.py,sha256=ZNL1XDvw-aG24_zGbP6Xkn203oVNqIwMau2exkiADS0,47994
 pycontrails/models/pcc.py,sha256=0Qdl4u8PmUEpNYd398glTChkbTwsh83wYPt0Bmi8qd8,11068
-pycontrails/models/tau_cirrus.py,sha256=2Z4egt-QFprkyITRgtarA5alOTTQRQbjzgmSqE49_1g,5778
+pycontrails/models/tau_cirrus.py,sha256=wMhh8xQ1byW9WdzRSJIAVDMeyZTBl_PUKMXdF6Zy1uE,5740
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
 pycontrails/models/issr.py,sha256=_qIKDgO0Owxeb0Q4WJlxcn1FJEvF3QDU-cqh2fpDsBo,7404
-pycontrails/models/sac.py,sha256=8Vx5wg4-Kb8l4GK67wp7VNVpdFM4Wyux1xKuNrjZ_IQ,15516
+pycontrails/models/sac.py,sha256=xTPTuCwYf8_goC5xJXxRl0NRZADuNOzyGJh13cuunQM,15490
 pycontrails/models/accf.py,sha256=_tunWpw1sYW8ES8RvpdhNahXwaf4LwdHMEdXhv7-cCI,13566
-pycontrails/models/dry_advection.py,sha256=3Vf-oug6an4WRHBOMlXZMsD7B6lx-ieMr-8mkSQyP3c,20496
+pycontrails/models/dry_advection.py,sha256=CwR37hwQEAWNrFKBrCjUmaaB3D-ToaQrxq2x7Ek5Hc4,20470
 pycontrails/models/pcr.py,sha256=Xde0aF8cMV9jTQ_uI2UvdHSLqotVUgPutb1Wgq7LtfY,5374
 pycontrails/models/emissions/__init__.py,sha256=CZB2zIkLUI3NGNmq2ddvRYjEtiboY6PWJjiEiXj_zII,478
 pycontrails/models/emissions/ffm2.py,sha256=mAvBHnp-p3hIn2fjKGq50eaMHi0jcb5hA5uXbJGeE9I,12068
@@ -87,36 +87,36 @@ pycontrails/models/apcemm/inputs.py,sha256=88GylkiaymEW_XZeFxLsICI9wV6kl8wVYsuyT
 pycontrails/models/apcemm/utils.py,sha256=Ex6EqXin6yoJv2WWhBotSzhjzUlFNZm2MDgL4CvvX6E,17082
 pycontrails/models/apcemm/apcemm.py,sha256=rKvIaEsqtLbZ5h4o4EOY4Ge4-HdPn2X4M1lEUFDvr68,39975
 pycontrails/models/apcemm/static/apcemm_yaml_template.yaml,sha256=uAZkc57OUvDMjgX6F5f6hgDh3Hgg1NbHWRUFSiv0DEI,6745
-pycontrails/models/humidity_scaling/humidity_scaling.py,sha256=ntNnhqo-lLvuQ6ntApDAtalZF6vmF8bK0PKUgmIye8c,38579
+pycontrails/models/humidity_scaling/humidity_scaling.py,sha256=l5S63mH6K5DOWk8LYtlbOz8wNbJQBcWd-DqCBUxKsik,38595
 pycontrails/models/humidity_scaling/__init__.py,sha256=nqsab_j9BCwMbTfCn4BjXMdhItlvNKkgUJ9-lb8RyIo,1119
 pycontrails/models/humidity_scaling/quantiles/era5-pressure-level-quantiles.pq,sha256=tfYhbafF9Z-gGCg6VQ1YBlOaK_01e65Dc6s9b-hQ6Zo,286375
 pycontrails/models/humidity_scaling/quantiles/era5-model-level-quantiles.pq,sha256=pShCvNUo0NYtAHhT9IBRuj38X9jejdlKfv-ZoOKmtKI,35943
 pycontrails/models/cocip/radiative_forcing.py,sha256=WleEc6hqrAlqJYtL3oZjRW7gJr_pPQNESJdOXi6oKqE,44686
 pycontrails/models/cocip/wind_shear.py,sha256=m6ZlWjORfI-lI-D74Z_dIMOHnK4FDYmkb0S6vSpKTO8,3868
 pycontrails/models/cocip/cocip.py,sha256=PgNuBzvTdkrANCjS_N9GscOkT9WXTaQUkI-IGxmMG9g,104847
-pycontrails/models/cocip/output_formats.py,sha256=dBT5-1yJsX_T_EoVhuja8ow4u-WlJRJ-7DihCgkyl7U,83980
+pycontrails/models/cocip/output_formats.py,sha256=nnEfwBdWRE7InoL9f8YLVtqK3cN4izbKuRMYds_6qOU,83950
 pycontrails/models/cocip/__init__.py,sha256=CWrkNd6S3ZJq04pjTc2W22sVAJeJD3bJJRy_zLW8Kkc,962
 pycontrails/models/cocip/cocip_params.py,sha256=BWmTt6yE4m-LM7lyCtj05FK3wVvU9n7iVnuauGq3jtA,12808
 pycontrails/models/cocip/wake_vortex.py,sha256=F5S8n4eBrBM-7qNcVUtX3IrXD7Kt9pWnrKj6UK-HGeA,14555
-pycontrails/models/cocip/cocip_uncertainty.py,sha256=jjejXM6Cd3icJuiQ9_T_qU0B983t6_2sRwQJiZxQ36o,12249
+pycontrails/models/cocip/cocip_uncertainty.py,sha256=TZ85xAbDc5zRgQKP7wb3AfHoUIvkfHycuX86dwZCqwM,12257
 pycontrails/models/cocip/radiative_heating.py,sha256=1U4SQWwogtyQ2u6J996kAHP0OfpZ3hH2_x4Cyt3Cy8U,18984
-pycontrails/models/cocip/contrail_properties.py,sha256=TpKzY7ZXLjbSKKGU6CVRLiFB_bp2O9YU6PXuLkAs1T0,55741
+pycontrails/models/cocip/contrail_properties.py,sha256=BRldMsxNIYlKHg5ozD5_wWtJ7OGTcQvinkQUioHqaqk,55732
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=bIRS-Z4MRMdkYtth2RaDe5h1ZN0HvCE_Sw96PXQEHKQ,18931
 pycontrails/models/ps_model/__init__.py,sha256=Fuum5Rq8ya8qkvbeq2wh6NDo-42RCRnK1Y-2syYy0Ck,553
 pycontrails/models/ps_model/ps_model.py,sha256=fgFekJpGuAu73KvpfLhlAbIwR7JJGwQpLILWmrONywc,31925
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=I2nBkdnRo9YGMn-0k35ooYpzPNJkHyEH5cU3K-Cz8b0,13350
 pycontrails/models/ps_model/ps_operational_limits.py,sha256=XwMHO8yu8EZUWtxRgjRKwxmCrmKGoHO7Ob6nlfkrthI,16441
-pycontrails/models/ps_model/ps_grid.py,sha256=rBsCEQkGY4cTf57spF0sqCfOo4oC4auE8ngS_mcl0VM,26207
+pycontrails/models/ps_model/ps_grid.py,sha256=IvBkPAJI3bAv8xx4pRZ6x4Sv8Pei1gmp5utTWhY9wgI,26169
 pycontrails/models/ps_model/static/ps-aircraft-params-20250328.csv,sha256=LUYuWozE8fv4ZxuPhQIyVi0Kz4aYGyRjPcH5bSl4oNs,26185
 pycontrails/models/ps_model/static/ps-synonym-list-20250328.csv,sha256=phtrf0m-UYQ7gjoKtIIwINzftTSNd-Bwe9CPen_Gvc8,1048
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=l4vBPrOKCJDz5Y1uMjmOGVyUcSWgfZtFWbjW968OPz8,5875
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
-pycontrails/models/cocipgrid/cocip_grid.py,sha256=k0IfdWJcCXdsuLZUEczPp3-QeKUPy7zpzk3nZnFG8Y8,92678
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=4BOmSMQEKxl4DYluq7q8bh1DWKlgNGw0N--0qaguomA,92633
 pycontrails/physics/geo.py,sha256=ITK23l1A2lzjNPTFC8ZKyQH59I5Cy_TvuvM_gbALo94,36297
 pycontrails/physics/units.py,sha256=p-6PzFLpVCMpvmfrhXVh3Hs-nMJw9Y1x-hvgnL9Lo9c,12281
 pycontrails/physics/constants.py,sha256=JHYL2IJY7del2BE_1QfKaEwtIwkbtyHvyxlm_JPHR90,3201
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44
-pycontrails/physics/thermo.py,sha256=v7-66PE31SJXz45MXAB9Iq9XfPg1Sn5FpOsTngLaDDI,15406
+pycontrails/physics/thermo.py,sha256=mGVduIY1c1DM6dVAdGcklGIJmscHXo3glDXmdeUtAZk,15376
 pycontrails/physics/jet.py,sha256=Je1d3vgbBEaVIAL1WZ3C-4p2f9fy9dWOjP5vFVsGGh8,30358
 pycontrails/physics/static/iata-cargo-load-factors-20250221.csv,sha256=ixsnQk1DyGxHMo0pDy4aOoQIwgOyrGfhMRPumEwPMBc,3841
 pycontrails/physics/static/iata-passenger-load-factors-20250221.csv,sha256=Q2olRIqUpbOaavvM5ikG8m1v1YQAN3KLNHeFDPvM53Q,3835