pycontrails 0.52.3__tar.gz → 0.53.0__tar.gz

{pycontrails-0.52.3 → pycontrails-0.53.0}/.github/workflows/doctest.yaml

@@ -80,6 +80,8 @@ jobs:
         run: |
           make nb-test
 
+      # The doctests require numpy 2.0 or higher
       - name: Test docstrings
         run: |
+          pip install "numpy>=2.0"
           make doctest

{pycontrails-0.52.3 → pycontrails-0.53.0}/.github/workflows/release.yaml

@@ -42,11 +42,11 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.20
         env:
-          CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
+          CIBW_BUILD: cp310-* cp311-* cp312-* cp313-*
           CIBW_SKIP: '*-win32 *-manylinux_i686 *-musllinux*'
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ARCHS_MACOS: x86_64 arm64
-          CIBW_TEST_SKIP: '*-macosx_arm64'
+          CIBW_TEST_SKIP: '*-macosx_arm64 cp313-*'
           # Completely isolate tests to prevent cibuildwheel from importing the
           # source instead of the wheel. This happens when tests/__init__.py is read.
           CIBW_TEST_EXTRAS: "complete,dev"

{pycontrails-0.52.3 → pycontrails-0.53.0}/.github/workflows/test.yaml

@@ -38,7 +38,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        pyversion: ['3.9', '3.10', '3.11', '3.12']
+        # TODO(Fall 2024): Add 3.13 once all dependencies are available
+        pyversion: ['3.10', '3.11', '3.12']
     runs-on: ${{ matrix.os }}
 
     steps:

{pycontrails-0.52.3 → pycontrails-0.53.0}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## v0.53.0
+
+### Breaking changes
+
+- Drop python 3.9 support per [NEP 29](https://numpy.org/neps/nep-0029-deprecation_policy.html).
+
+### Features
+
+- Build wheels for [python 3.13](https://peps.python.org/pep-0719/). (These wheels are available on PyPI, but other pycontrails dependencies may not yet support python 3.13.)
+
+### Fixes
+
+- Fix `PycontrailsRegularGridInterpolator` for compatibility with the latest scipy version.
+
+### Internals
+
+- Defer import of `skimage` and `rasterio`.
+
 ## v0.52.3
 
 ### Features

{pycontrails-0.52.3/pycontrails.egg-info → pycontrails-0.53.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.52.3
+Version: 0.53.0
 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 → pycontrails-0.53.0}/README.md

@@ -25,7 +25,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 → pycontrails-0.53.0}/docs/api.rst

@@ -151,6 +151,16 @@ Gridded CoCiP
     models.cocipgrid.CocipGridParams
 
 
+Dry Advection
+"""""""""""""
+
+.. autosummary::
+    :toctree: api/
+
+    models.dry_advection.DryAdvection
+    models.dry_advection.DryAdvectionParams
+
+
 ACCF
 """"
 

{pycontrails-0.52.3 → pycontrails-0.53.0}/docs/install.rst

@@ -17,7 +17,7 @@ The conda-forge package includes all optional runtime dependencies.
 pip install
 -----------
 
-With Python 3.9 or later, install the latest release from PyPI using ``pip``:
+With Python 3.10 or later, install the latest release from PyPI using ``pip``:
 
 .. code-block:: bash
 
@@ -27,6 +27,8 @@ With Python 3.9 or later, install the latest release from PyPI using ``pip``:
     # install with all optional dependencies
     $ pip install "pycontrails[complete]"
 
+Wheels are currently built for python 3.10 - 3.13 on Linux, macOS, and Windows. The python 3.13
+wheels are not yet tested in CI/CD and not all runtime dependencies are available for python 3.13.
 
 Install the latest development version directly from GitHub:
 

{pycontrails-0.52.3 → pycontrails-0.53.0}/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.0'
+__version_tuple__ = version_tuple = (0, 53, 0)

{pycontrails-0.52.3 → pycontrails-0.53.0}/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-0.52.3 → pycontrails-0.53.0}/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-0.52.3 → pycontrails-0.53.0}/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-0.52.3 → pycontrails-0.53.0}/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-0.52.3 → pycontrails-0.53.0}/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-0.52.3 → pycontrails-0.53.0}/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-0.52.3 → pycontrails-0.53.0}/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)