pycontrails 0.52.3__cp310-cp310-macosx_10_9_x86_64.whl → 0.53.1__cp310-cp310-macosx_10_9_x86_64.whl

pycontrails/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.52.3'
-__version_tuple__ = version_tuple = (0, 52, 3)
+__version__ = version = '0.53.1'
+__version_tuple__ = version_tuple = (0, 53, 1)

pycontrails/core/cache.py

@@ -146,7 +146,7 @@ class CacheStore(ABC):
         """
 
         # TODO: run in parallel?
-        return [self.put(d, cp) for d, cp in zip(data_path, cache_path)]
+        return [self.put(d, cp) for d, cp in zip(data_path, cache_path, strict=True)]
 
     # In the three methods below, child classes have a complete docstring.
 

pycontrails/core/flight.py

@@ -1356,7 +1356,7 @@ class Flight(GeoVectorDataset):
             # NOTE: geod.npts does not return the initial or terminal points
             lonlats: list[tuple[float, float]] = geod.npts(lon0, lat0, lon1, lat1, n_steps)
 
-            lons, lats = zip(*lonlats)
+            lons, lats = zip(*lonlats, strict=True)
             longitudes.extend(lons)
             latitudes.extend(lats)
 
@@ -1657,10 +1657,11 @@ def _return_linestring(data: dict[str, npt.NDArray[np.float64]]) -> list[list[fl
         The list of coordinates
     """
     # rounding to reduce the size of resultant json arrays
-    points = zip(  # pylint: disable=zip-builtin-not-iterating
+    points = zip(
         np.round(data["longitude"], decimals=4),
         np.round(data["latitude"], decimals=4),
         np.round(data["altitude"], decimals=4),
+        strict=True,
     )
     return [list(p) for p in points]
 
@@ -1949,7 +1950,9 @@ def _altitude_interpolation_climb_descend_middle(
     # Form array of cumulative altitude values if the flight were to climb
     # at nominal_rocd over each group of nan
     cumalt_list = []
-    for start_na_idx, end_na_idx, size in zip(start_na_idxs, end_na_idxs, na_group_size):
+    for start_na_idx, end_na_idx, size in zip(
+        start_na_idxs, end_na_idxs, na_group_size, strict=True
+    ):
         if s[start_na_idx] <= s[end_na_idx]:
             cumalt_list.append(np.arange(1, size, dtype=float))
         else:
@@ -2053,7 +2056,7 @@ def filter_altitude(
     --------
     :meth:`traffic.core.flight.Flight.filter`
     :func:`scipy.signal.medfilt`
-    """  # noqa: E501
+    """
     if not len(altitude_ft):
         raise ValueError("Altitude must have non-zero length to filter")
 
@@ -2114,7 +2117,7 @@ def filter_altitude(
 
     result = np.copy(altitude_ft)
     if np.any(start_idxs):
-        for i0, i1 in zip(start_idxs, end_idxs):
+        for i0, i1 in zip(start_idxs, end_idxs, strict=True):
             result[i0:i1] = altitude_filt[i0:i1]
 
     # reapply Savitzky-Golay filter to smooth climb and descent

pycontrails/core/flightplan.py

@@ -93,7 +93,7 @@ def parse_atc_plan(atc_plan: str) -> dict[str, str]:
     See Also
     --------
     :func:`to_atc_plan`
-    """  # noqa: E501
+    """
     atc_plan = atc_plan.replace("\r", "")
     atc_plan = atc_plan.replace("\n", "")
     atc_plan = atc_plan.upper()

pycontrails/core/interpolation.py

@@ -76,6 +76,7 @@ class PycontrailsRegularGridInterpolator(scipy.interpolate.RegularGridInterpolat
         self.method = _pick_method(scipy.__version__, method)
         self.bounds_error = bounds_error
         self.fill_value = fill_value
+        self._spline = None
 
     def _prepare_xi_simple(self, xi: npt.NDArray[np.float64]) -> npt.NDArray[np.bool_]:
         """Run looser version of :meth:`_prepare_xi`.

pycontrails/core/met.py

@@ -70,12 +70,12 @@ class MetBase(ABC, Generic[XArrayType]):
     cachestore: CacheStore | None
 
     #: Default dimension order for DataArray or Dataset (x, y, z, t)
-    dim_order: list[Hashable] = [
+    dim_order: tuple[Hashable, Hashable, Hashable, Hashable] = (
         "longitude",
         "latitude",
         "level",
         "time",
-    ]
+    )
 
     def __repr__(self) -> str:
         data = getattr(self, "data", None)
@@ -200,10 +200,8 @@ class MetBase(ABC, Generic[XArrayType]):
     def _validate_transpose(self) -> None:
         """Check that data is transposed according to :attr:`dim_order`."""
 
-        dims_tuple = tuple(self.dim_order)
-
         def _check_da(da: xr.DataArray, key: Hashable | None = None) -> None:
-            if da.dims != dims_tuple:
+            if da.dims != self.dim_order:
                 if key is not None:
                     msg = (
                         f"Data dimension not transposed on variable '{key}'. Initiate with"
@@ -271,7 +269,7 @@ class MetBase(ABC, Generic[XArrayType]):
         self.data["time"] = self.data["time"].astype("datetime64[ns]", copy=False)
 
         # sortby to ensure each coordinate has ascending order
-        self.data = self.data.sortby(self.dim_order, ascending=True)
+        self.data = self.data.sortby(list(self.dim_order), ascending=True)
 
         if not self.is_wrapped:
             # Ensure longitude is contained in interval [-180, 180)
@@ -293,7 +291,7 @@ class MetBase(ABC, Generic[XArrayType]):
         self._validate_latitude()
 
         # transpose to have ordering (x, y, z, t, ...)
-        dim_order = self.dim_order + [d for d in self.data.dims if d not in self.dim_order]
+        dim_order = [*self.dim_order, *(d for d in self.data.dims if d not in self.dim_order)]
         self.data = self.data.transpose(*dim_order)
 
         # single level data
@@ -489,7 +487,7 @@ class MetBase(ABC, Generic[XArrayType]):
         self.cachestore = self.cachestore or DiskCacheStore()
 
         # group by hour and save one dataset for each hour to temp file
-        times, datasets = zip(*dataset.groupby("time", squeeze=False))
+        times, datasets = zip(*dataset.groupby("time", squeeze=False), strict=True)
 
         # Open ExitStack to control temp_file context manager
         with ExitStack() as stack:
@@ -920,7 +918,7 @@ class MetDataset(MetBase):
         KeyError
             Raises when dataset does not contain variable in ``vars``
         """
-        if isinstance(vars, (MetVariable, str)):
+        if isinstance(vars, MetVariable | str):
             vars = (vars,)
 
         met_keys: list[str] = []
@@ -1022,7 +1020,7 @@ class MetDataset(MetBase):
 
     @overrides
     def broadcast_coords(self, name: str) -> xr.DataArray:
-        da = xr.ones_like(self.data[list(self.data.keys())[0]]) * self.data[name]
+        da = xr.ones_like(self.data[next(iter(self.data.keys()))]) * self.data[name]
         da.name = name
 
         return da
@@ -1074,7 +1072,7 @@ class MetDataset(MetBase):
         coords_vals = [indexes[key].values for key in coords_keys]
         coords_meshes = np.meshgrid(*coords_vals, indexing="ij")
         raveled_coords = (mesh.ravel() for mesh in coords_meshes)
-        data = dict(zip(coords_keys, raveled_coords))
+        data = dict(zip(coords_keys, raveled_coords, strict=True))
 
         out = vector_module.GeoVectorDataset(data, copy=False)
         for key, da in self.data.items():
@@ -1865,7 +1863,7 @@ class MetDataArray(MetBase):
         cachestore = cachestore or DiskCacheStore()
         chunks = chunks or {}
         data = _load(hash, cachestore, chunks)
-        return cls(data[list(data.data_vars)[0]])
+        return cls(data[next(iter(data.data_vars))])
 
     @property
     def proportion(self) -> float:
@@ -2258,7 +2256,7 @@ class MetDataArray(MetBase):
         -----
         Uses the `scikit-image Marching Cubes  <https://scikit-image.org/docs/dev/auto_examples/edges/plot_marching_cubes.html>`_
         algorithm to reconstruct a surface from the point-cloud like arrays.
-        """  # noqa: E501
+        """
         try:
             from skimage import measure
         except ModuleNotFoundError as e:

pycontrails/core/met_var.py

@@ -22,7 +22,7 @@ class MetVariable:
     - `NCEP Grib v2 Code Table <https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2.shtml>`_
 
     Used for defining support parameters in a grib-like fashion.
-    """  # noqa: E501
+    """
 
     #: Short variable name.
     #: Chosen for greatest consistency between data sources.

pycontrails/core/models.py

@@ -11,7 +11,7 @@ import warnings
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
 from dataclasses import dataclass, fields
-from typing import Any, NoReturn, TypeVar, Union, overload
+from typing import Any, NoReturn, TypeVar, overload
 
 import numpy as np
 import numpy.typing as npt
@@ -30,13 +30,13 @@ from pycontrails.utils.types import type_guard
 logger = logging.getLogger(__name__)
 
 #: Model input source types
-ModelInput = Union[MetDataset, GeoVectorDataset, Flight, Sequence[Flight], None]
+ModelInput = MetDataset | GeoVectorDataset | Flight | Sequence[Flight] | None
 
 #: Model output source types
-ModelOutput = Union[MetDataArray, MetDataset, GeoVectorDataset, Flight, list[Flight], NoReturn]
+ModelOutput = MetDataArray | MetDataset | GeoVectorDataset | Flight | list[Flight]
 
 #: Model attribute source types
-SourceType = Union[MetDataset, GeoVectorDataset, Flight, Fleet]
+SourceType = MetDataset | GeoVectorDataset | Flight | Fleet
 
 _Source = TypeVar("_Source")
 
@@ -453,7 +453,7 @@ class Model(ABC):
             return Fleet.from_seq(source)
 
         # Raise error if source is not a MetDataset or GeoVectorDataset
-        if not isinstance(source, (MetDataset, GeoVectorDataset)):
+        if not isinstance(source, MetDataset | GeoVectorDataset):
             msg = f"Unknown source type: {type(source)}"
             raise TypeError(msg)
 

pycontrails/core/vector.py

@@ -847,7 +847,7 @@ class VectorDataset:
         ------
         TypeError
             If ``mask`` is not a boolean array.
-        """  # noqa: E501
+        """
         self.data._validate_array(mask)
         if mask.dtype != bool:
             raise TypeError("Parameter `mask` must be a boolean array.")
@@ -983,7 +983,7 @@ class VectorDataset:
         numeric_attrs = (
             attr
             for attr, val in self.attrs.items()
-            if (isinstance(val, (int, float, np.number)) and attr not in ignore_keys)
+            if (isinstance(val, int | float | np.number) and attr not in ignore_keys)
         )
         self.broadcast_attrs(numeric_attrs, overwrite)
 
@@ -1072,7 +1072,7 @@ class VectorDataset:
                 obj = obj.to_numpy()
 
             # Convert numpy objects to python objects
-            if isinstance(obj, (np.ndarray, np.generic)):
+            if isinstance(obj, np.ndarray | np.generic):
 
                 # round time to unix seconds
                 if key == "time":
@@ -1166,7 +1166,7 @@ class VectorDataset:
         attrs = {}
 
         for k, v in {**obj, **obj_kwargs}.items():
-            if isinstance(v, (list, np.ndarray)):
+            if isinstance(v, list | np.ndarray):
                 data[k] = v
             else:
                 attrs[k] = v
@@ -1194,7 +1194,7 @@ class VectorDataset:
         See Also
         --------
         :func:`numpy.array_split`
-        """  # noqa: E501
+        """
         full_index = np.arange(self.size)
         index_splits = np.array_split(full_index, n_splits)
         for index in index_splits:

pycontrails/datalib/_leo_utils/vis.py

@@ -6,16 +6,6 @@ import numpy as np
 
 from pycontrails.utils import dependencies
 
-try:
-    import skimage as ski
-except ModuleNotFoundError as exc:
-    dependencies.raise_module_not_found_error(
-        name="landsat module",
-        package_name="scikit-image",
-        module_not_found_error=exc,
-        pycontrails_optional_package="sat",
-    )
-
 
 def normalize(channel: np.ndarray) -> np.ndarray:
     """Normalize channel values to range [0, 1], preserving ``np.nan`` in output.
@@ -53,8 +43,17 @@ def equalize(channel: np.ndarray, **equalize_kwargs: Any) -> np.ndarray:
     NaN values are converted to 0 before passing to :py:func:`ski.exposure.equalize_adapthist`
     and may affect equalized values in the neighborhood where they occur.
     """
+    try:
+        import skimage.exposure
+    except ModuleNotFoundError as exc:
+        dependencies.raise_module_not_found_error(
+            name="landsat module",
+            package_name="scikit-image",
+            module_not_found_error=exc,
+            pycontrails_optional_package="sat",
+        )
     return np.where(
         np.isnan(channel),
         np.nan,
-        ski.exposure.equalize_adapthist(np.nan_to_num(channel, nan=0), **equalize_kwargs),
+        skimage.exposure.equalize_adapthist(np.nan_to_num(channel, nan=0.0), **equalize_kwargs),
     )

pycontrails/datalib/_met_utils/metsource.py

@@ -8,7 +8,7 @@ import logging
 import pathlib
 from collections.abc import Sequence
 from datetime import datetime
-from typing import Any, Union
+from typing import Any, TypeAlias
 
 import numpy as np
 import pandas as pd
@@ -20,11 +20,13 @@ from pycontrails.utils.types import DatetimeLike
 
 logger = logging.getLogger(__name__)
 
-TimeInput = Union[str, DatetimeLike, Sequence[Union[str, DatetimeLike]]]
-VariableInput = Union[
-    str, int, MetVariable, np.ndarray, Sequence[Union[str, int, MetVariable, Sequence[MetVariable]]]
-]
-PressureLevelInput = Union[int, float, np.ndarray, Sequence[Union[int, float]]]
+# https://github.com/python/mypy/issues/14824
+TimeInput: TypeAlias = str | DatetimeLike | Sequence[str | DatetimeLike]
+VariableInput = (
+    str | int | MetVariable | np.ndarray | Sequence[str | int | MetVariable | Sequence[MetVariable]]
+)
+
+PressureLevelInput = int | float | np.ndarray | Sequence[int | float]
 
 #: NetCDF engine to use for parsing netcdf files
 NETCDF_ENGINE: str = "netcdf4"
@@ -66,23 +68,23 @@ def parse_timesteps(time: TimeInput | None, freq: str | None = "1h") -> list[dat
     ------
     ValueError
         Raises when the time has len > 2 or when time elements fail to be parsed with pd.to_datetime
-    """  # noqa: E501
+    """
 
     if time is None:
         return []
 
     # confirm input is tuple or list-like of length 2
-    if isinstance(time, (str, datetime, pd.Timestamp, np.datetime64)):
+    if isinstance(time, str | datetime | pd.Timestamp | np.datetime64):
         time = (time, time)
     elif len(time) == 1:
         time = (time[0], time[0])
     elif len(time) != 2:
-        msg = f"Input time bounds must have length < 2 and > 0, got {len(time)}"
+        msg = f"Input time bounds must have length 1 or 2, got {len(time)}"
         raise ValueError(msg)
 
     # convert all to pandas Timestamp
     try:
-        timestamps = [pd.to_datetime(t) for t in time]
+        t0, t1 = (pd.to_datetime(t) for t in time)
     except ValueError as e:
         msg = (
             f"Failed to parse time input {time}. "
@@ -91,10 +93,13 @@ def parse_timesteps(time: TimeInput | None, freq: str | None = "1h") -> list[dat
         raise ValueError(msg) from e
 
     if freq is None:
-        daterange = pd.DatetimeIndex([timestamps[0], timestamps[1]])
+        daterange = pd.DatetimeIndex([t0, t1])
     else:
         # get date range that encompasses all whole hours
-        daterange = pd.date_range(timestamps[0].floor(freq), timestamps[1].ceil(freq), freq=freq)
+        daterange = pd.date_range(t0.floor(freq), t1.ceil(freq), freq=freq)
+        if len(daterange) == 0:
+            msg = f"Time range {t0} to {t1} with freq {freq} has no valid time steps."
+            raise ValueError(msg)
 
     # return list of datetimes
     return daterange.to_pydatetime().tolist()
@@ -151,7 +156,7 @@ def parse_pressure_levels(
         Raises ValueError if pressure level is not supported by ECMWF data source
     """
     # Ensure pressure_levels is array-like
-    if isinstance(pressure_levels, (int, float)):
+    if isinstance(pressure_levels, int | float):
         pressure_levels = [pressure_levels]
 
     # Cast array-like to int dtype and sort
@@ -212,7 +217,7 @@ def parse_variables(variables: VariableInput, supported: list[MetVariable]) -> l
     met_var_list: list[MetVariable] = []
 
     # ensure input variables are a list of str
-    if isinstance(variables, (str, int, MetVariable)):
+    if isinstance(variables, str | int | MetVariable):
         parsed_variables = [variables]
     elif isinstance(variables, np.ndarray):
         parsed_variables = variables.tolist()
@@ -257,7 +262,7 @@ def _find_match(
 
     # list of MetVariable options
     # here we extract the first MetVariable in var that is supported
-    elif isinstance(var, (list, tuple)):
+    elif isinstance(var, list | tuple):
         for v in var:
             # sanity check since we don't support other types as lists
             if not isinstance(v, MetVariable):

pycontrails/datalib/ecmwf/common.py

@@ -63,7 +63,7 @@ class ECMWFAPI(metsource.MetDataSource):
             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))
+                missing_times = sorted(np_timesteps.difference(ds["time"].values))  # type: ignore[type-var]
                 msg = f"Input dataset is missing time coordinates {[str(t) for t in missing_times]}"
                 raise KeyError(msg) from exc
 

pycontrails/datalib/ecmwf/era5.py

@@ -80,10 +80,17 @@ class ERA5(ECMWFAPI):
         Cache data store for staging ECMWF ERA5 files.
         Defaults to :class:`cache.DiskCacheStore`.
         If None, cache is turned off.
-    url : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ url
-    key : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ key
+    url : str | None
+        Override the default `cdsapi <https://github.com/ecmwf/cdsapi>`_ url.
+        As of August 2024, the url for the `CDS-Beta <https://cds-beta.climate.copernicus.eu>`_
+        is "https://cds-beta.climate.copernicus.eu/api", and the url for the legacy server is
+        "https://cds.climate.copernicus.eu/api/v2". If None, the url is set
+        by the ``CDSAPI_URL`` environment variable. If this is not defined, the
+        ``cdsapi`` package will determine the url.
+    key : str | None
+        Override default `cdsapi <https://github.com/ecmwf/cdsapi>`_ key. If None,
+        the key is set by the ``CDSAPI_KEY`` environment variable. If this is not defined,
+        the ``cdsapi`` package will determine the key.
 
     Notes
     -----
@@ -121,7 +128,7 @@ class ERA5(ECMWFAPI):
     ...     pressure_levels=[350, 300],
     ...     cachestore=gcp_cache
     ... )
-    """  # noqa: E501
+    """
 
     __slots__ = (
         "product_type",
@@ -522,17 +529,21 @@ class ERA5(ECMWFAPI):
         xr.Dataset
             Processed :class:`xr.Dataset`
         """
-
         if "pycontrails_version" in ds.attrs:
             LOG.debug("Input dataset processed with pycontrails > 0.29")
             return ds
 
-        # not pre-processed source file from `download` or `paths`
-
-        # for "reanalysis-era5-single-levels" or if self.pressure_levels length == 1,
+        # For "reanalysis-era5-single-levels" or if self.pressure_levels length == 1,
         # then the netcdf file does not contain the dimension "level"
         if len(self.pressure_levels) == 1:
-            ds = ds.expand_dims({"level": self.pressure_levels})
+            ds = ds.expand_dims(level=self.pressure_levels)
+
+        # New CDS-Beta gives "valid_time" instead of "time"
+        # and "pressure_level" instead of "level"
+        if "valid_time" in ds:
+            ds = ds.rename(valid_time="time")
+        if "pressure_level" in ds:
+            ds = ds.rename(pressure_level="level")
 
         ds.attrs["pycontrails_version"] = pycontrails.__version__
         return ds

pycontrails/datalib/ecmwf/era5_model_level.py

@@ -54,8 +54,8 @@ ALL_ENSEMBLE_MEMBERS = list(range(10))
 class ERA5ModelLevel(ECMWFAPI):
     """Class to support model-level ERA5 data access, download, and organization.
 
-    The interface is similar to :class:`pycontrails.datalib.ecmwf.ERA5`, which downloads pressure-level
-    with much lower vertical resolution.
+    The interface is similar to :class:`pycontrails.datalib.ecmwf.ERA5`, which downloads
+    pressure-level with much lower vertical resolution.
 
     Requires account with
     `Copernicus Data Portal <https://cds.climate.copernicus.eu/cdsapp#!/home>`_
@@ -114,11 +114,18 @@ class ERA5ModelLevel(ECMWFAPI):
     cache_grib: bool, optional
         If True, cache downloaded GRIB files rather than storing them in a temporary file.
         By default, False.
-    url : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ url
-    key : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ key
-    """  # noqa: E501
+    url : str | None
+        Override the default `cdsapi <https://github.com/ecmwf/cdsapi>`_ url.
+        As of August 2024, the url for the `CDS-Beta <https://cds-beta.climate.copernicus.eu>`_
+        is "https://cds-beta.climate.copernicus.eu/api", and the url for the legacy server is
+        "https://cds.climate.copernicus.eu/api/v2". If None, the url is set
+        by the ``CDSAPI_URL`` environment variable. If this is not defined, the
+        ``cdsapi`` package will determine the url.
+    key : str | None
+        Override default `cdsapi <https://github.com/ecmwf/cdsapi>`_ key. If None,
+        the key is set by the ``CDSAPI_KEY`` environment variable. If this is not defined,
+        the ``cdsapi`` package will determine the key.
+    """
 
     __marker = object()
 
@@ -349,7 +356,7 @@ class ERA5ModelLevel(ECMWFAPI):
         unique_dates = set(t.strftime("%Y-%m-%d") for t in times)
         unique_times = set(t.strftime("%H:%M:%S") for t in times)
         # param 152 = log surface pressure, needed for metview level conversion
-        grib_params = set(self.variable_ecmwfids + [152])
+        grib_params = set((*self.variable_ecmwfids, 152))
         common = {
             "class": "ea",
             "date": "/".join(sorted(unique_dates)),

pycontrails/datalib/ecmwf/hres_model_level.py

@@ -377,7 +377,7 @@ class HRESModelLevel(ECMWFAPI):
         time = self.forecast_time.strftime("%H:%M:%S")
         steps = self.get_forecast_steps(times)
         # param 152 = log surface pressure, needed for metview level conversion
-        grib_params = set(self.variable_ecmwfids + [152])
+        grib_params = set((*self.variable_ecmwfids, 152))
         return (
             f"retrieve,\n"
             f"class=od,\n"
@@ -473,8 +473,8 @@ class HRESModelLevel(ECMWFAPI):
             LOG.debug("Opening GRIB file")
             fs_ml = mv.read(target)
 
-            # reduce memory overhead by cacheing one timestep at a time
-            for time, step in zip(times, self.get_forecast_steps(times)):
+            # reduce memory overhead by caching one timestep at a time
+            for time, step in zip(times, self.get_forecast_steps(times), strict=True):
                 fs_pl = mv.Fieldset()
                 selection = dict(step=step)
                 lnsp = fs_ml.select(shortName="lnsp", **selection)

pycontrails/datalib/ecmwf/variables.py

@@ -118,7 +118,7 @@ RelativeHumidity = MetVariable(
         "At temperatures below -23°C it is calculated for saturation over ice. "
         "Between -23°C and 0°C this parameter is calculated by interpolating between the ice and"
         " water values using a quadratic function."
-        "See https://www.ecmwf.int/sites/default/files/elibrary/2016/17117-part-iv-physical-processes.pdf#subsection.7.4.2"  # noqa: E501
+        "See https://www.ecmwf.int/sites/default/files/elibrary/2016/17117-part-iv-physical-processes.pdf#subsection.7.4.2"
     ),
 )
 
@@ -166,7 +166,7 @@ TopNetSolarRadiation = MetVariable(
         "The incoming solar radiation is the amount received from the Sun. "
         "The outgoing solar radiation is the amount reflected and scattered by the Earth's"
         " atmosphere and surface"
-        "See https://www.ecmwf.int/sites/default/files/elibrary/2015/18490-radiation-quantities-ecmwf-model-and-mars.pdf"  # noqa: E501
+        "See https://www.ecmwf.int/sites/default/files/elibrary/2015/18490-radiation-quantities-ecmwf-model-and-mars.pdf"
     ),
 )
 
@@ -183,7 +183,7 @@ TopNetThermalRadiation = MetVariable(
         "radiation emitted to space at the top of the atmosphere is commonly known as the Outgoing"
         " Longwave Radiation (OLR). "
         "The top net thermal radiation (this parameter) is equal to the negative of OLR."
-        "See https://www.ecmwf.int/sites/default/files/elibrary/2015/18490-radiation-quantities-ecmwf-model-and-mars.pdf"  # noqa: E501
+        "See https://www.ecmwf.int/sites/default/files/elibrary/2015/18490-radiation-quantities-ecmwf-model-and-mars.pdf"
     ),
 )
 

pycontrails/datalib/gfs/gfs.py

@@ -13,8 +13,9 @@ import hashlib
 import logging
 import pathlib
 import warnings
+from collections.abc import Callable
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 import pandas as pd
@@ -113,7 +114,7 @@ class GFSForecast(metsource.MetDataSource):
     - `Documentation <https://www.ncei.noaa.gov/products/weather-climate-models/global-forecast>`_
     - `Parameter sets <https://www.nco.ncep.noaa.gov/pmb/products/gfs/>`_
     - `GFS Documentation <https://www.emc.ncep.noaa.gov/emc/pages/numerical_forecast_systems/gfs/documentation.php>`_
-    """  # noqa: E501
+    """
 
     __slots__ = ("client", "grid", "cachestore", "show_progress", "forecast_time")
 
@@ -495,7 +496,7 @@ class GFSForecast(metsource.MetDataSource):
             GFS dataset
         """
         # translate into netcdf from grib
-        logger.debug(f"Translating {filepath} for timestep {str(t)} into netcdf")
+        logger.debug(f"Translating {filepath} for timestep {t!s} into netcdf")
 
         # get step for timestep
         step = pd.Timedelta(t - self.forecast_time) // pd.Timedelta(1, "h")

pycontrails/datalib/landsat.py

@@ -33,15 +33,6 @@ except ModuleNotFoundError as exc:
         pycontrails_optional_package="sat",
     )
 
-try:
-    import rasterio
-except ModuleNotFoundError as exc:
-    dependencies.raise_module_not_found_error(
-        name="landsat module",
-        package_name="rasterio",
-        module_not_found_error=exc,
-        pycontrails_optional_package="sat",
-    )
 
 #: BigQuery table with imagery metadata
 BQ_TABLE = "bigquery-public-data.cloud_storage_geo_index.landsat_index"
@@ -313,6 +304,16 @@ def _check_band_resolution(bands: set[str]) -> None:
 
 def _read(path: str, meta: str, band: str, processing: str) -> xr.DataArray:
     """Read imagery data from Landsat files."""
+    try:
+        import rasterio
+    except ModuleNotFoundError as exc:
+        dependencies.raise_module_not_found_error(
+            name="landsat module",
+            package_name="rasterio",
+            module_not_found_error=exc,
+            pycontrails_optional_package="sat",
+        )
+
     src = rasterio.open(path)
     img = src.read(1)
     crs = pyproj.CRS.from_epsg(src.crs.to_epsg())

pycontrails/ext/synthetic_flight.py

@@ -417,7 +417,7 @@ class SyntheticFlight:
         times_arr = np.asarray(times).T
         data = [
             {"longitude": lon, "latitude": lat, "level": level, "time": time}
-            for lon, lat, level, time in zip(lons_arr, lats_arr, level, times_arr)
+            for lon, lat, level, time in zip(lons_arr, lats_arr, level, times_arr, strict=True)
         ]
         dfs = [pd.DataFrame(d).dropna() for d in data]
         dfs = [df for df in dfs if len(df) >= self.min_n_waypoints]

pycontrails/models/accf.py

@@ -154,7 +154,7 @@ class ACCF(Model):
     sur_variables = (ecmwf.SurfaceSolarDownwardRadiation, ecmwf.TopNetThermalRadiation)
     default_params = ACCFParams
 
-    short_vars = {v.short_name for v in (*met_variables, *sur_variables)}
+    short_vars = frozenset(v.short_name for v in (*met_variables, *sur_variables))
 
     # This variable won't get used since we are not writing the output
     # anywhere, but the library will complain if it's not defined

pycontrails/models/apcemm/apcemm.py

@@ -84,10 +84,10 @@ class APCEMMParams(models.ModelParams):
     engine_uid: str | None = None
 
     #: Aircraft performance model
-    aircraft_performance: AircraftPerformance = PSFlight()
+    aircraft_performance: AircraftPerformance = dataclasses.field(default_factory=PSFlight)
 
     #: Fuel type
-    fuel: Fuel = JetA()
+    fuel: Fuel = dataclasses.field(default_factory=JetA)
 
     #: List of flight waypoints to simulate in APCEMM.
     #: By default, runs a simulation for every waypoint.
@@ -371,7 +371,7 @@ class APCEMM(models.Model):
     @overload
     def eval(self, source: None = ..., **params: Any) -> NoReturn: ...
 
-    def eval(self, source: Flight | None = None, **params: Any) -> Flight | NoReturn:
+    def eval(self, source: Flight | None = None, **params: Any) -> Flight:
         """Set up and run APCEMM simulations initialized at flight waypoints.
 
         Simulates the formation and evolution of contrails from a Flight
@@ -776,8 +776,8 @@ class APCEMM(models.Model):
         # Compute azimuth
         # Use forward and backward differences for first and last waypoints
         # and centered differences elsewhere
-        ileft = [0] + list(range(self.source.size - 1))
-        iright = list(range(1, self.source.size)) + [self.source.size - 1]
+        ileft = [0, *range(self.source.size - 1)]
+        iright = [*range(1, self.source.size), self.source.size - 1]
         lon0 = self.source["longitude"][ileft]
         lat0 = self.source["latitude"][ileft]
         lon1 = self.source["longitude"][iright]

pycontrails/models/cocip/cocip.py

@@ -335,7 +335,7 @@ class Cocip(Model):
         self,
         source: Flight | Sequence[Flight] | None = None,
         **params: Any,
-    ) -> Flight | list[Flight] | NoReturn:
+    ) -> Flight | list[Flight]:
         """Run CoCiP simulation on flight.
 
         Simulates the formation and evolution of contrails from a Flight
@@ -1132,7 +1132,7 @@ class Cocip(Model):
         )
         vector = GeoVectorDataset(
             {
-                key: np.concat((latest_contrail[key], future_contrails[key]))
+                key: np.concatenate((latest_contrail[key], future_contrails[key]))
                 for key in ("longitude", "latitude", "level", "time")
             }
         )
@@ -1516,7 +1516,7 @@ def _process_rad(rad: MetDataset) -> MetDataset:
     -----
     - https://www.ecmwf.int/sites/default/files/elibrary/2015/18490-radiation-quantities-ecmwf-model-and-mars.pdf
     - https://confluence.ecmwf.int/pages/viewpage.action?pageId=155337784
-    """  # noqa: E501
+    """
     # If the time coordinate has already been shifted, early return
     if "shift_radiation_time" in rad["time"].attrs:
         return rad

pycontrails/models/cocip/output_formats.py

@@ -638,7 +638,7 @@ def regional_statistics(da_var: xr.DataArray, *, agg: str) -> pd.Series:
     -----
     - The spatial bounding box for each region is defined in Teoh et al. (2023)
     - Teoh, R., Engberg, Z., Shapiro, M., Dray, L., and Stettler, M.: A high-resolution Global
-        Aviation emissions Inventory based on ADS-B (GAIA) for 2019–2021, EGUsphere [preprint],
+        Aviation emissions Inventory based on ADS-B (GAIA) for 2019-2021, EGUsphere [preprint],
         https://doi.org/10.5194/egusphere-2023-724, 2023.
     """
     if (agg == "mean") and (len(da_var.time) > 1):
@@ -715,7 +715,7 @@ def _regional_data_arrays(da_global: xr.DataArray) -> dict[str, xr.DataArray]:
     -----
     - The spatial bounding box for each region is defined in Teoh et al. (2023)
     - Teoh, R., Engberg, Z., Shapiro, M., Dray, L., and Stettler, M.: A high-resolution Global
-        Aviation emissions Inventory based on ADS-B (GAIA) for 2019–2021, EGUsphere [preprint],
+        Aviation emissions Inventory based on ADS-B (GAIA) for 2019-2021, EGUsphere [preprint],
         https://doi.org/10.5194/egusphere-2023-724, 2023.
     """
     return {

pycontrails/models/cocip/radiative_forcing.py

@@ -10,6 +10,7 @@ References
 from __future__ import annotations
 
 import dataclasses
+import itertools
 
 import numpy as np
 import numpy.typing as npt
@@ -941,7 +942,7 @@ def contrail_contrail_overlap_radiative_effects(
     References
     ----------
     - Schumann et al. (2021) Air traffic and contrail changes over Europe during COVID-19:
-        A model study, Atmos. Chem. Phys., 21, 7429–7450, https://doi.org/10.5194/ACP-21-7429-2021.
+        A model study, Atmos. Chem. Phys., 21, 7429-7450, https://doi.org/10.5194/ACP-21-7429-2021.
     - Teoh et al. (2023) Global aviation contrail climate effects from 2019 to 2021.
 
     Notes
@@ -999,8 +1000,7 @@ def contrail_contrail_overlap_radiative_effects(
     # Account for contrail overlapping starting from bottom to top layers
     altitude_layers = np.arange(min_altitude_m, max_altitude_m + 1.0, dz_overlap_m)
 
-    # TODO: replace zip with itertools.pairwise after we drop python3.9 support
-    for alt_layer0, alt_layer1 in zip(altitude_layers, altitude_layers[1:]):
+    for alt_layer0, alt_layer1 in itertools.pairwise(altitude_layers):
         is_in_layer = (altitude >= alt_layer0) & (altitude < alt_layer1)
 
         # Get contrail waypoints at current altitude layer

pycontrails/models/cocipgrid/cocip_grid.py

@@ -143,7 +143,7 @@ class CocipGrid(models.Model):
 
     def eval(
         self, source: GeoVectorDataset | MetDataset | None = None, **params: Any
-    ) -> GeoVectorDataset | MetDataset | NoReturn:
+    ) -> GeoVectorDataset | MetDataset:
         """Run CoCiP simulation on a 4d coordinate grid or arbitrary set of 4d points.
 
         If the :attr:`params` ``verbose_outputs_evolution`` is True, the model holds
@@ -322,7 +322,7 @@ class CocipGrid(models.Model):
 
         if met is None:
             # idx is the first index at which self.met.variables["time"].to_numpy() >= time_end
-            idx = np.searchsorted(self.met.indexes["time"].to_numpy(), time_end)
+            idx = np.searchsorted(self.met.indexes["time"].to_numpy(), time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
             logger.debug("Select met slice %s", sl)
             met = MetDataset(self.met.data.isel(time=sl), copy=False)
@@ -331,7 +331,7 @@ class CocipGrid(models.Model):
             current_times = met.indexes["time"].to_numpy()
             all_times = self.met.indexes["time"].to_numpy()
             # idx is the first index at which all_times >= time_end
-            idx = np.searchsorted(all_times, time_end)
+            idx = np.searchsorted(all_times, time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
 
             # case 1: cannot re-use end of current met as start of new met
@@ -353,7 +353,7 @@ class CocipGrid(models.Model):
 
         if rad is None:
             # idx is the first index at which self.rad.variables["time"].to_numpy() >= time_end
-            idx = np.searchsorted(self.rad.indexes["time"].to_numpy(), time_end)
+            idx = np.searchsorted(self.rad.indexes["time"].to_numpy(), time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
             logger.debug("Select rad slice %s", sl)
             rad = MetDataset(self.rad.data.isel(time=sl), copy=False)
@@ -362,7 +362,7 @@ class CocipGrid(models.Model):
             current_times = rad.indexes["time"].to_numpy()
             all_times = self.rad.indexes["time"].to_numpy()
             # idx is the first index at which all_times >= time_end
-            idx = np.searchsorted(all_times, time_end)
+            idx = np.searchsorted(all_times, time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
 
             # case 1: cannot re-use end of current rad as start of new rad
@@ -446,9 +446,9 @@ class CocipGrid(models.Model):
         if ap_model := self.params["aircraft_performance"]:
             attrs["ap_model"] = type(ap_model).__name__
 
-        if isinstance(azimuth, (np.floating, np.integer)):
+        if isinstance(azimuth, np.floating | np.integer):
             attrs["azimuth"] = azimuth.item()
-        elif isinstance(azimuth, (float, int)):
+        elif isinstance(azimuth, float | int):
             attrs["azimuth"] = azimuth
 
         if isinstance(self.source, MetDataset):
@@ -897,7 +897,7 @@ def _setdefault_from_params(key: str, vector: GeoVectorDataset, params: dict[str
     if scalar is None:
         return
 
-    if not isinstance(scalar, (int, float)):
+    if not isinstance(scalar, int | float):
         msg = (
             f"Parameter {key} must be a scalar. For non-scalar values, directly "
             "set the data on the 'source'."

pycontrails/models/ps_model/ps_model.py

@@ -312,7 +312,7 @@ class PSFlight(AircraftPerformance):
                 atyp_param.wing_surface_area,
                 q_fuel,
             )
-        elif isinstance(fuel_flow, (int, float)):
+        elif isinstance(fuel_flow, int | float):
             fuel_flow = np.full_like(true_airspeed, fuel_flow)
 
         # Flight phase
@@ -339,11 +339,11 @@ class PSFlight(AircraftPerformance):
 
         # XXX: Explicitly broadcast scalar inputs as needed to keep a consistent
         # output spec.
-        if isinstance(aircraft_mass, (int, float)):
+        if isinstance(aircraft_mass, int | float):
             aircraft_mass = np.full_like(true_airspeed, aircraft_mass)
-        if isinstance(engine_efficiency, (int, float)):
+        if isinstance(engine_efficiency, int | float):
             engine_efficiency = np.full_like(true_airspeed, engine_efficiency)
-        if isinstance(thrust, (int, float)):
+        if isinstance(thrust, int | float):
             thrust = np.full_like(true_airspeed, thrust)
 
         return AircraftPerformanceData(

pycontrails/models/sac.py

@@ -150,7 +150,7 @@ class SAC(Model):
         if scale_humidity:
             for k, v in humidity_scaling.description.items():
                 self.source.attrs[f"humidity_scaling_{k}"] = v
-        if isinstance(engine_efficiency, (int, float)):
+        if isinstance(engine_efficiency, int | float):
             self.source.attrs["engine_efficiency"] = engine_efficiency
 
         return self.source
@@ -236,7 +236,7 @@ def T_sat_liquid(G: ArrayLike) -> ArrayLike:
     # This comment is pasted several places in `pycontrails` -- they should all be
     # addressed at the same time.
     log_ = np.log(G - 0.053)
-    return -46.46 - constants.absolute_zero + 9.43 * log_ + 0.72 * log_**2  # type: ignore[return-value]  # noqa: E501
+    return -46.46 - constants.absolute_zero + 9.43 * log_ + 0.72 * log_**2  # type: ignore[return-value]
 
 
 def _e_sat_liquid_prime(T: ArrayScalarLike) -> ArrayScalarLike:

pycontrails/physics/thermo.py

@@ -163,7 +163,7 @@ def e_sat_liquid(T: ArrayScalarLike) -> ArrayScalarLike:
     # 6.1121 * np.exp((18.678 * (T - 273.15) / 234.5) * (T - 273.15) / (257.14 + (T - 273.15)))
 
     # Magnus Tetens (Murray, 1967)
-    # 6.1078 * np.exp(17.269388 * (T - 273.16) / (T – 35.86))
+    # 6.1078 * np.exp(17.269388 * (T - 273.16) / (T - 35.86))
 
     # Guide to Meteorological Instruments and Methods of Observation (CIMO Guide) (WMO, 2008)
     # 6.112 * np.exp(17.62 * (T - 273.15) / (243.12 + T - 273.15))

pycontrails/utils/json.py

@@ -48,23 +48,21 @@ class NumpyEncoder(json.JSONEncoder):
         """
         if isinstance(
             obj,
-            (
-                np.int_,
-                np.intc,
-                np.intp,
-                np.int8,
-                np.int16,
-                np.int32,
-                np.int64,
-                np.uint8,
-                np.uint16,
-                np.uint32,
-                np.uint64,
-            ),
+            np.int_
+            | np.intc
+            | np.intp
+            | np.int8
+            | np.int16
+            | np.int32
+            | np.int64
+            | np.uint8
+            | np.uint16
+            | np.uint32
+            | np.uint64,
         ):
             return int(obj)
 
-        if isinstance(obj, (np.float16, np.float32, np.float64)):
+        if isinstance(obj, np.float16 | np.float32 | np.float64):
             return float(obj)
 
         # TODO: this is not easily reversible - np.timedelta64(str(np.timedelta64(1, "h"))) raises
@@ -74,10 +72,10 @@ class NumpyEncoder(json.JSONEncoder):
         if isinstance(obj, (np.datetime64)):
             return str(obj)
 
-        if isinstance(obj, (np.complex64, np.complex128)):
+        if isinstance(obj, np.complex64 | np.complex128):
             return {"real": obj.real, "imag": obj.imag}
 
-        if isinstance(obj, (np.ndarray,)):
+        if isinstance(obj, np.ndarray):
             return obj.tolist()
 
         if isinstance(obj, (np.bool_)):
@@ -86,7 +84,7 @@ class NumpyEncoder(json.JSONEncoder):
         if isinstance(obj, (np.void)):
             return None
 
-        if isinstance(obj, (pd.Series, pd.Index)):
+        if isinstance(obj, pd.Series | pd.Index):
             return obj.to_numpy().tolist()
 
         try:
@@ -146,7 +144,7 @@ def dataframe_to_geojson_points(
         )
 
     # downselect dataframe
-    cols = ["longitude", "latitude", "altitude", "time"] + properties
+    cols = ["longitude", "latitude", "altitude", "time", *properties]
     df = df[cols]
 
     # filter out coords with nan values, or filter just on "filter_nan" labels

pycontrails/utils/types.py

@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 import functools
+from collections.abc import Callable
 from datetime import datetime
-from typing import Any, Callable, TypeVar, Union
+from typing import Any, TypeVar
 
 import numpy as np
 import numpy.typing as npt
@@ -12,11 +13,11 @@ import pandas as pd
 import xarray as xr
 
 #: Array like (np.ndarray, xr.DataArray)
-ArrayLike = TypeVar("ArrayLike", np.ndarray, xr.DataArray, Union[xr.DataArray, np.ndarray])
+ArrayLike = TypeVar("ArrayLike", np.ndarray, xr.DataArray, xr.DataArray | np.ndarray)
 
 #: Array or Float (np.ndarray, float)
 ArrayOrFloat = TypeVar(
-    "ArrayOrFloat", npt.NDArray[np.float64], float, Union[float, npt.NDArray[np.float64]]
+    "ArrayOrFloat", npt.NDArray[np.float64], float, float | npt.NDArray[np.float64]
 )
 
 #: Array like input (np.ndarray, xr.DataArray, np.float64, float)
@@ -26,8 +27,8 @@ ArrayScalarLike = TypeVar(
     xr.DataArray,
     np.float64,
     float,
-    Union[np.ndarray, float],
-    Union[xr.DataArray, np.ndarray],
+    np.ndarray | float,
+    xr.DataArray | np.ndarray,
 )
 
 #: Datetime like input (datetime, pd.Timestamp, np.datetime64)
@@ -71,7 +72,7 @@ def support_arraylike(
             return ret
 
         # Keep python native numeric types native
-        if isinstance(arr, (float, int, np.float64)):
+        if isinstance(arr, float | int | np.float64):
             return ret.item()
 
         # Recreate pd.Series

{pycontrails-0.52.3.dist-info → pycontrails-0.53.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.52.3
+Version: 0.53.1
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -14,16 +14,16 @@ Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 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 :: 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.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
@@ -36,7 +36,7 @@ Requires-Dist: xarray>=2022.3
 Provides-Extra: complete
 Requires-Dist: pycontrails[ecmwf,gcp,gfs,jupyter,pyproj,sat,vis,zarr]; extra == "complete"
 Provides-Extra: dev
-Requires-Dist: black[jupyter]==24.4.2; extra == "dev"
+Requires-Dist: black[jupyter]==24.8.0; extra == "dev"
 Requires-Dist: dep-license; extra == "dev"
 Requires-Dist: fastparquet>=0.8; extra == "dev"
 Requires-Dist: ipdb>=0.13; extra == "dev"
@@ -50,7 +50,7 @@ Requires-Dist: pyarrow>=5.0; extra == "dev"
 Requires-Dist: pytest>=8.2; extra == "dev"
 Requires-Dist: pytest-cov>=2.11; extra == "dev"
 Requires-Dist: requests>=2.25; extra == "dev"
-Requires-Dist: ruff==0.5.3; extra == "dev"
+Requires-Dist: ruff==0.5.7; extra == "dev"
 Requires-Dist: setuptools; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: doc8>=1.1; extra == "docs"
@@ -141,7 +141,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.9 or later required):
+You can install pycontrails from PyPI with `pip` (Python 3.10 or later required):
 
 ```bash
 $ pip install pycontrails

{pycontrails-0.52.3.dist-info → pycontrails-0.53.1.dist-info}/RECORD

@@ -1,67 +1,67 @@
-pycontrails-0.52.3.dist-info/RECORD,,
-pycontrails-0.52.3.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.52.3.dist-info/WHEEL,sha256=8_xXByiR31GifVzczzfHQvP68yJzFCUTFfpzI25kPtk,110
-pycontrails-0.52.3.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.52.3.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.52.3.dist-info/METADATA,sha256=0OlDUND65RdPbrTL_Zt4hXkn_A3nPptiZ5vXLk1gfaU,9170
-pycontrails/_version.py,sha256=oUlYgy_HesUiXOJT6LNUWojwIHRLzqLUsE1WSH4KNos,413
+pycontrails-0.53.1.dist-info/RECORD,,
+pycontrails-0.53.1.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.53.1.dist-info/WHEEL,sha256=jFHkobo6rN-a6CTGUlJ_m4H0MrXln-JQnZbz6nohX5Y,110
+pycontrails-0.53.1.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.53.1.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
+pycontrails-0.53.1.dist-info/METADATA,sha256=zCTO7zFOkvqI0JzbmFthdOuZs7Mdt5vl66qd3z7_x0Q,9173
+pycontrails/_version.py,sha256=vV71ixZB5LSC5mFURNjkJpZgkyEImidyN2Ez0p0YzQk,413
 pycontrails/__init__.py,sha256=O2T9kXCMhcELcMZz7HEnwiBhh4Gfcj-yG1HtrotOKHQ,2001
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=ZvI-hQylANy6X8cSBMPa51FnMkmkjASsPyKLflZQJOg,71571
-pycontrails/core/models.py,sha256=z06ggBjtWJyDXUexGtoaUgHJA6e7jajqPvZvMXvlSwk,39310
-pycontrails/core/interpolation.py,sha256=w3F6G1vmmBgBnjlL06G01CaRYpfm2wrQLbkwBhX_Xx8,25589
+pycontrails/core/vector.py,sha256=v_oO7if8SbNPMRci0TR8hLGSdAZ_fGZOVIT47e4hA58,71541
+pycontrails/core/models.py,sha256=mB3fhmBorFxt7uEhBFcuu0PIMWmBRB4KBRsPiFpPcvo,39282
+pycontrails/core/interpolation.py,sha256=yxVLO9lzNcNFeLwDyrQ7yfz4JEHLHTpgIRBrcOezsXg,25617
 pycontrails/core/fleet.py,sha256=wqYY_2xD9X-Og0_oxU8ZPqTHYDau9TOPLQcmEnB1kiQ,16140
-pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=-1m37uDPvuZm1B1cjbbx5V2kW_CRYkwCAmJB6H4Jbhw,295344
-pycontrails/core/flight.py,sha256=EdB8_P8BELSyXx01CXw_js0zgv-bdsqj3_mt28lhKMU,85144
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=w28LODiNKFpZoyTEVnI2XWIdXtNqUJSt5Nuqxm6BDxc,295344
+pycontrails/core/flight.py,sha256=_1K6tgwAJZwe18xmkOE7l0JQXzr6XgiqRQGzS6qHpxk,85159
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
 pycontrails/core/polygon.py,sha256=gosyZBX1XBKD2EcHycIZb7uM-xGs8rCfdpiSZlhc2Hc,18028
-pycontrails/core/cache.py,sha256=9TaHyLtCpDazgN5zEt0aa4xNgvNcMc4oO_6nEz0XhYE,27971
+pycontrails/core/cache.py,sha256=ly2Prq5CUxxc2pClZUXDeH-E8zkj3zZkLoKpdKUCyGs,27984
 pycontrails/core/__init__.py,sha256=x1z6x8w3sYmEqYcNWyWHuNkS9lPUPbHUoYJZs1K0q98,856
-pycontrails/core/flightplan.py,sha256=s7tHbjMFbHAJkSWV6hPkghuW6jDb1n5UhWAo9XbJ9z0,7349
-pycontrails/core/met.py,sha256=vQl2Xenr0Ar-UFofzHOnCDS1NjnP6w5PbupTXDZY6ZI,101325
+pycontrails/core/flightplan.py,sha256=UO4vL087d5TZMlU984-FxfotGTxFbqK78w2fLDRiel4,7335
+pycontrails/core/met.py,sha256=0lGZqGu-_EnulU9Df05xo0I-IYX2MRQXvJ7PgCjU6p0,101342
 pycontrails/core/aircraft_performance.py,sha256=4KnLj0zK-mk8Oo3As1CXUkQWBQGMeDdrKi5TeOhOmUA,26107
 pycontrails/core/airports.py,sha256=aeyAXVkioIRomrP79UtNrxindL4f1DJyXFaojZCuBBw,6758
-pycontrails/core/met_var.py,sha256=EhrLGdrCAp8cKb-3Whd_ttLMZn4_zLMhE-QyFinESqo,9197
+pycontrails/core/met_var.py,sha256=GC5ijw4oGuIefmFOSz4vmxMEBj_SVs5Z75IMhDP56Cw,9183
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
 pycontrails/datalib/goes.py,sha256=Muh_pqAXSqUlM4ssStUT9QmPxGPEKK21LHFroaqTq7k,26533
-pycontrails/datalib/landsat.py,sha256=jV6E9TMmo3x_EEb-4BnD3L7nB5C3NCLT7FaXoMxXP64,19645
+pycontrails/datalib/landsat.py,sha256=WBOXcVgkoWmEM1jeUnOX1IKBOzzUbHWFU3lL3pJ8rfE,19682
 pycontrails/datalib/spire.py,sha256=66SnMdA8KOS69USjKmqrJmTKPK08Ehih9tnlsCt-AJw,25331
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=Rzsp5Hv6Rh3XVEfvFeofmClId4Eq2KhdYiEhIqFPE3U,17222
-pycontrails/datalib/_met_utils/metsource.py,sha256=mh7nWfpnP5l7unuQHDSYjar4hN7k9iSDNd6cYZcwwWM,23844
+pycontrails/datalib/_met_utils/metsource.py,sha256=1MLLnMDHlzXgRD-oeuZObgOoY8sGde81hluTm8oILPg,23965
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=YuoPmPlP9TpZ6qhUPLbb30y3D3dTNDasTLZqP5MAWtw,18624
-pycontrails/datalib/ecmwf/era5.py,sha256=TMX9bJHvALvSbxFI0BpwI9l3yMoxI1ecc2ROfvPaNIE,18242
-pycontrails/datalib/ecmwf/era5_model_level.py,sha256=0R96ATNVp1UB63M_ER6aEqdY60dfkj_0SNVjyD6a8fE,18945
+pycontrails/datalib/ecmwf/era5.py,sha256=MvL8TgC8Wg-Q3pZSGVsvGRNL-HT_ndQT7CRdv2bGK7k,19016
+pycontrails/datalib/ecmwf/era5_model_level.py,sha256=8ewGjs0LU_sySPMCk0B1xcAeMGydDx31AOXao9vrbNE,19519
 pycontrails/datalib/ecmwf/hres.py,sha256=p_l0ytCEEWGam7G7aVynpLmH4H4LQNeVe0Ay7Tw6fp8,28240
-pycontrails/datalib/ecmwf/variables.py,sha256=S5SV_kPrWRhwOpOYcWw3V5VRUB_HOVCTw3Sf7UClJEk,9605
-pycontrails/datalib/ecmwf/hres_model_level.py,sha256=XomrGw7FdjmXRWLAgYSqvB3Nd00dz9HyZt0fH5ZyA6I,19135
+pycontrails/datalib/ecmwf/variables.py,sha256=jsyHxQ8YTjLA_28DrKvplFn7pOC4T6SrO4j9d2wpkic,9563
+pycontrails/datalib/ecmwf/hres_model_level.py,sha256=-xh6BIEvsyddqJjuV7tygV85H5J8k4gCUKjj2kdkJkY,19147
 pycontrails/datalib/ecmwf/__init__.py,sha256=kwgk9P4RYdLgOYcBLXX5rWz1T_yL7aO8nt2Eb1PB-eE,1455
-pycontrails/datalib/ecmwf/common.py,sha256=p6zTQcojmTNF2FYGztxhX7cYEg9d29JH6_v2mrKteW0,3878
+pycontrails/datalib/ecmwf/common.py,sha256=PIkEdYEmlmwxQ7v4TenW_BaHX7mslnmdJW3iZYXb7Kg,3904
 pycontrails/datalib/ecmwf/model_levels.py,sha256=x83WJtjC6OnHcUsiNgvYIrVX4lY-pkXR-YlvUo9vYis,2712
 pycontrails/datalib/ecmwf/ifs.py,sha256=2heema398PoEVCfiTZSBawN25PXAa_CpWm_pGLZ1GuY,10662
 pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=PmvGLRzn6uuCKSwiasSuVcehvvmSaqP7cnLuN6hhCQQ,9788
-pycontrails/datalib/_leo_utils/vis.py,sha256=5DgfRFZGqLm-lm72UlSobWbYk6stJ96o804kRG5S2cI,1759
+pycontrails/datalib/_leo_utils/vis.py,sha256=-fLcm1D5cP6lThVHovV3MJSiadWyTUAvYDMvr4drMU4,1802
 pycontrails/datalib/_leo_utils/search.py,sha256=r87T2OV4qH1pYI2YznvsBL042f4RKxD3OA2snd3-kDI,8687
 pycontrails/datalib/_leo_utils/static/bq_roi_query.sql,sha256=xq6-tJyz0-bUwW0KjQymqygjH3WlQBmyBtP7Ci7SBe8,260
-pycontrails/datalib/gfs/gfs.py,sha256=yektP3gDKpjdmh1FnCOw5D8fq4kQDg4Yti4zqM4wYlo,21639
+pycontrails/datalib/gfs/gfs.py,sha256=fmYFf7KOGr91sFFCfThG61A3vauNis8TGIAZItIOsrY,21649
 pycontrails/datalib/gfs/variables.py,sha256=KESzB1sTD3hsU8T-qZFD29oFM3l2ZcEtjAE_H7BHKIE,2861
 pycontrails/datalib/gfs/__init__.py,sha256=tWxgqmlW8Uo07J-3fBTXPrteatzTka9mSXomhWy3NVA,684
-pycontrails/ext/synthetic_flight.py,sha256=65LxC1ZZNJrd8YcSgg6739ouPNf0VgVCOfEhK4W4YkI,16679
+pycontrails/ext/synthetic_flight.py,sha256=ypv_vUwpG-DyzD-uswk9MrJdj-k4NgsoJGJPvRkTFuo,16692
 pycontrails/ext/cirium.py,sha256=DFPfRwLDwddpucAPRQhyT4bDGh0VvvoViMUd3pidam8,415
 pycontrails/ext/empirical_grid.py,sha256=WSC266aKsQLzCmtrZJCpLdDBykZ9rlFE9xEXmZjbgHo,4362
 pycontrails/ext/bada.py,sha256=j4Tj7oWSV_6UxYYa9_OjC1yTVzJMQdNRDI4aUQam_xM,1063
 pycontrails/utils/iteration.py,sha256=q_vb39VjxRr4hqTyPYko3gK4sboJOJf_Evq6m_2DL-g,319
 pycontrails/utils/__init__.py,sha256=Gt_57sBgfliFSxx9sDpuchykFDxmM11Wg9xAeSqPcnI,32
-pycontrails/utils/types.py,sha256=skrZuOB1yQivtg7rUi8bZwBzOD9ZINu93Cx0NaLzCkw,4773
+pycontrails/utils/types.py,sha256=QeJQwpdyjd3OGU9bz86mIuZvvqgV3WoF0QpAZenD6u8,4769
 pycontrails/utils/temp.py,sha256=lGU0b_R8ze4yKlsOusHIIBaoNFBrmrB3vBjgHRlfcXk,1109
-pycontrails/utils/json.py,sha256=4PL7xkt-O9VGvngHh8F1nfbSbgoxjNlDZDUQRxYfcCM,5982
+pycontrails/utils/json.py,sha256=b3JQ6cZ4Uy4-5e-uVAXr8t-KXC_bj_a1qHmXM0Nof58,5914
 pycontrails/utils/dependencies.py,sha256=ATP45xYdUbIyGFzgbOe5SbokMytvB84TcexUEFnEUZE,2559
 pycontrails/models/pcc.py,sha256=7hIlg_4-F6Ce7KVFyuIZBZY6uDr1h4KRMqBDlpGkzHE,11116
 pycontrails/models/tau_cirrus.py,sha256=yNYw4ukT68w2ATGFZr3p8AZxB6A2xufXQq7XP2U51y0,5026
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
 pycontrails/models/issr.py,sha256=k8yCKCtKLW0ECC0QIs-ID1zbr6vHJfeBm9Shq3oaA3U,7351
-pycontrails/models/sac.py,sha256=B-0acGuYs2ajFYtSMGP4LO328OsAjQ7v2bnQ5HCw4Ak,15961
-pycontrails/models/accf.py,sha256=20XWID_6aoFLDOfanf5ncay_azPbZSA2NoowJSZbM20,12559
+pycontrails/models/sac.py,sha256=lV1Or0AaLxuS1Zo5V8h5c1fkSKC-hKEgiFm7bmmusWw,15946
+pycontrails/models/accf.py,sha256=uPu8EB30Zbd3kd-3BuTnJkFNzpFqQ4u0HftFOJOX51s,12568
 pycontrails/models/dry_advection.py,sha256=jToOXFwv0V-ZbgpJBvUgTq-AiKP4El_uq1SWS6Oi6YY,16556
 pycontrails/models/pcr.py,sha256=ZzbEuTOuDdUmmL5T3Wk3HL-O8XzX3HMnn98WcPbASaU,5348
 pycontrails/models/emissions/__init__.py,sha256=N_EE768TNRDbdmXaxly2Pwun7UmVBTVPc4k89VBz5ys,478
@@ -74,16 +74,16 @@ pycontrails/models/emissions/static/default-engine-uids.csv,sha256=3blb0aqtM8YRs
 pycontrails/models/apcemm/__init__.py,sha256=M-hrJklbSgBckclm526MiBAhpKPLHgJbB58ArbJuGIk,175
 pycontrails/models/apcemm/inputs.py,sha256=88GylkiaymEW_XZeFxLsICI9wV6kl8wVYsuyTe8zIQ8,6585
 pycontrails/models/apcemm/utils.py,sha256=xlEVe0RKFXrqDr4V77mbb2HxY8IK42EX4K86tN1sLQs,17094
-pycontrails/models/apcemm/apcemm.py,sha256=E6Ov1akN7SCa_Y2Atgw85eaoV9uML6tRZ5cKHztphqs,39894
+pycontrails/models/apcemm/apcemm.py,sha256=PGuTSfeeA5kOzdTIeHV0svTht7walVoQ8foqf5iR8Ls,39937
 pycontrails/models/apcemm/static/apcemm_yaml_template.yaml,sha256=uAZkc57OUvDMjgX6F5f6hgDh3Hgg1NbHWRUFSiv0DEI,6745
 pycontrails/models/humidity_scaling/humidity_scaling.py,sha256=9619kSgNIBjkM8vFWcwny7t4mhg00pX0aKabrDGPn7I,36658
 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=ERuFcYMo0_1iiOricnZ8D4ext23bMnTCeZwg9vd6Vzs,44944
+pycontrails/models/cocip/radiative_forcing.py,sha256=aA4ZHaVOsg0lro04LwwKaBf3mXljRAzbwQpDLaxk4qU,44873
 pycontrails/models/cocip/wind_shear.py,sha256=p8d3iaNzxPA3MoxFEM1ZDKt0aticoD6U9cv0QmbuBzs,3860
-pycontrails/models/cocip/cocip.py,sha256=yJQqlOuPNq_XFxhX8UtAAi7djxrh9r5bbClRE8zP2cE,100109
-pycontrails/models/cocip/output_formats.py,sha256=TfMHBKtj0BGwfXpu37vqOXS9K8oBXo1t8_XDJxdSHY4,83645
+pycontrails/models/cocip/cocip.py,sha256=zUvWQi77N13mx6nlIEbpvmEMPkdJoU2lsfK3iWovGXM,100089
+pycontrails/models/cocip/output_formats.py,sha256=7P0j-UX4NNw56Gkd3ZsWDt0ctorJTZ4aPmUiibAh1FM,83641
 pycontrails/models/cocip/__init__.py,sha256=jd-9Tq20s1kwQBlxsYfZLi3hlT5MnWOY2XsPazq1fgE,962
 pycontrails/models/cocip/cocip_params.py,sha256=kKTeF1vVQr361XBR79q4mQHYI7UUQ6C5Ik5Z5pJDtag,12703
 pycontrails/models/cocip/wake_vortex.py,sha256=i_OF193KK5BCMdVCgK0_4Aqn55f6rnL4WDWEac8um-w,14421
@@ -92,7 +92,7 @@ pycontrails/models/cocip/radiative_heating.py,sha256=YRpwfXgFnf89iuJiIM96q-jbdcM
 pycontrails/models/cocip/contrail_properties.py,sha256=tycCxKf8j9GvVYDQBPxjtp6xLll-r00C0XW-w1jGbMI,55594
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=kDxFpAIkcqqhGmwXoxv3_cSESj1Ur45GbLJF56IACJs,14573
 pycontrails/models/ps_model/__init__.py,sha256=5L-HympF1gJaZ6xiNkIQJygJhkDxM3-ejS_T2z-83hQ,495
-pycontrails/models/ps_model/ps_model.py,sha256=jOznGL37sWlQWjV2DpwCLDKdvw2U0XQdvQ_jRm4hj_w,33017
+pycontrails/models/ps_model/ps_model.py,sha256=Cj79eJxHfq6205zNPxrwSs_Cx337MU3qvc7ds8sHAjA,33013
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=-PfT2JC6RckVi_zTDVTqAMyaS-id6I2klUoXoEXreAc,13077
 pycontrails/models/ps_model/ps_operational_limits.py,sha256=_vFJiPqGuZJRzwuY10-z07-7eEyomnpxPm_Js1Cd5So,16832
 pycontrails/models/ps_model/ps_grid.py,sha256=AqZCEytWhrNbyujlJTufI4cxDonkPchGnrB3IvtRID4,18667
@@ -100,10 +100,10 @@ pycontrails/models/ps_model/static/ps-synonym-list-20240524.csv,sha256=ksrpQTHkx
 pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=3eNhSwzut0gon04k2EYKKaXRvQSUlau3yBAbHS0EBao,25784
 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=MLsh3rZb-6Q7vnad6YYTfZs83-kSJEbhjfWTS9oooXI,94333
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=B1-f3D62fg3OeLp7xnxANAsneg9JRiiRVMqs-REFaII,94347
 pycontrails/physics/geo.py,sha256=9ZWIXyEEgrBNqsoeBBlYLTA-8GUTgyc-jgeVgchxXa8,30288
 pycontrails/physics/units.py,sha256=j-G5AC9eWIvv2MTOq9lUOoOQKFNJJuHzWLanHRji2tE,12272
 pycontrails/physics/constants.py,sha256=pHQQmccMUwuNnY4hFtm3L8G2rnUQcfJnroyQr8HAVeM,3146
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44
-pycontrails/physics/thermo.py,sha256=UA7jLApcbu53fo1ACtgF578Np17efn0UN1yxwus4gEQ,12789
+pycontrails/physics/thermo.py,sha256=sWGpKa12daSpqZYNgyXd8Ii5nfA_1Mm5mMbnM5GsW-E,12787
 pycontrails/physics/jet.py,sha256=JX-o5dDjyITMNUIOcD_7UBt_4ldc9v-5gI6bmwf0wQ4,25624

{pycontrails-0.52.3.dist-info → pycontrails-0.53.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_10_9_x86_64
 

{pycontrails-0.52.3.dist-info → pycontrails-0.53.1.dist-info}/top_level.txt

@@ -1,3 +1,2 @@
-build
 pycontrails
 wheelhouse