pycontrails 0.54.7__tar.gz → 0.54.8__tar.gz

{pycontrails-0.54.7 → pycontrails-0.54.8}/.github/workflows/release.yaml

@@ -40,7 +40,7 @@ jobs:
 
       # https://cibuildwheel.readthedocs.io/en/stable/options/#testing
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.22
+        uses: pypa/cibuildwheel@v2.23
         env:
           CIBW_BUILD: cp310-* cp311-* cp312-* cp313-*
           CIBW_SKIP: '*-win32 *-manylinux_i686 *-musllinux*'

{pycontrails-0.54.7 → pycontrails-0.54.8}/.github/workflows/scorecard.yaml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run OpenSSF Security Scorecard
-        uses: ossf/scorecard-action@v2.4.0
+        uses: ossf/scorecard-action@v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif

{pycontrails-0.54.7 → pycontrails-0.54.8}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.54.8
+
+### Features
+
+- Update the Poll-Schumann Aircraft Performance model:
+  - Support the Support Boeing 737 MAX 10 aircraft type.
+  - Update aircraft maximum landing weight, maximum zero fuel weight, operating empty weight, and maximum payload within the static CSVs for existing aircraft types as recommended by Ian Poll.
+- Add `ExponentialBoostLatitudeCorrectionHumidityScaling` calibrated for model-level ERA5 data.
+
+### Internals
+
+- Update the `pycontrails.physics.static` CSV files to include newly released global and regional passenger and cargo load factor data from IATA (Oct-2024 to Dec-2024).
+- Attach `n_ice_per_m_0` and `f_surv` to the downwash flight computed in the `Cocip` runtime. This data is now saved as part of the `Cocip` output.
+- Rename and modify `contrail_properties.ice_particle_number` to `contrail_properties.initial_ice_particle_number`.
+- Rename `ValidateTrajectoryHandler.CRUISE_ROCD_THRESHOLD_FPS` -> `ValidateTrajectoryHandler.ROCD_THRESHOLD_FPS`. Update its value from 4.2 ft/sec ->  83.25 ft/sec.
+- Remove the altitude filter on the `ValidateTrajectoryHandler` ROCD check. Now all waypoints are checked for ROCD violations.
+- Correctly parse "DOF" (departure date) field from flight plan in the `flightplan` module.
+
 ## v0.54.7
 
 ### Features

{pycontrails-0.54.7/pycontrails.egg-info → pycontrails-0.54.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.54.7
+Version: 0.54.8
 Summary: Python library for modeling aviation climate impacts
 Author-email: "Contrails.org" <py@contrails.org>
 License: Apache-2.0
@@ -111,6 +111,7 @@ Provides-Extra: zarr
 Requires-Dist: fsspec>=2022.7.1; extra == "zarr"
 Requires-Dist: gcsfs>=2022.7.1; extra == "zarr"
 Requires-Dist: zarr>=2.12; extra == "zarr"
+Dynamic: license-file
 
 # pycontrails
 

{pycontrails-0.54.7 → pycontrails-0.54.8}/docs/index.rst

@@ -4,7 +4,7 @@ pycontrails
 
 *Python library for modeling contrails and other aviation climate impacts.*
 
-Learn more on `contrails.org <https://contrails.org>`_.
+Learn more at `Contrails.org <https://contrails.org>`_.
 
 .. list-table::
    :widths: 30 70

{pycontrails-0.54.7 → pycontrails-0.54.8}/pycontrails/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.54.7'
-__version_tuple__ = version_tuple = (0, 54, 7)
+__version__ = version = '0.54.8'
+__version_tuple__ = version_tuple = (0, 54, 8)

{pycontrails-0.54.7 → pycontrails-0.54.8}/pycontrails/core/cache.py

@@ -266,6 +266,8 @@ class DiskCacheStore(CacheStore):
         >>> # put a file directly
         >>> disk_cache.put("README.md", "test/file.md")
         'test/file.md'
+
+        >>> disk_cache.clear()  # cleanup
         """
 
         if not pathlib.Path(data_path).is_file():
@@ -312,6 +314,8 @@ class DiskCacheStore(CacheStore):
         >>> # returns a path
         >>> disk_cache.get("test/file.md")
         'cache/test/file.md'
+
+        >>> disk_cache.clear()  # cleanup
         """
         return self.path(cache_path)
 

{pycontrails-0.54.7 → pycontrails-0.54.8}/pycontrails/core/flightplan.py

@@ -38,10 +38,13 @@ def to_atc_plan(plan: dict[str, Any]) -> str:
     if "second_alt_icao" in plan:
         ret += f" {plan['second_alt_icao']}"
     ret += "\n"
-    ret += f"-{plan['other_info']})\n"
+    ret += f"-{plan['other_info']}"
     if "supplementary_info" in plan:
+        ret += "\n-"
         ret += " ".join([f"{i[0]}/{i[1]}" for i in plan["supplementary_info"].items()])
 
+    ret += ")"
+
     if ret[-1] == "\n":
         ret = ret[:-1]
 
@@ -194,7 +197,12 @@ def parse_atc_plan(atc_plan: str) -> dict[str, str]:
 
     # Other info
     if len(basic) > 8:
-        flightplan["other_info"] = basic[8]
+        info = basic[8]
+        idx = info.find("DOF")
+        if idx != -1:
+            flightplan["departure_date"] = info[idx + 4 : idx + 10]
+
+        flightplan["other_info"] = info.strip()
 
     # Supl. Info
     if len(basic) > 9:

{pycontrails-0.54.7 → pycontrails-0.54.8}/pycontrails/core/met.py

@@ -2643,19 +2643,24 @@ def downselect(data: XArrayType, bbox: tuple[float, ...]) -> XArrayType:
             "or length 6 [west, south, min-level, east, north, max-level]"
         )
 
+    if west <= east:
+        # Return a view of the data
+        # If data is lazy, this will not load the data
+        return data.sel(
+            longitude=slice(west, east),
+            latitude=slice(south, north),
+            level=slice(level_min, level_max),
+        )
+
+    # In this case, the bbox spans the antimeridian
+    # If data is lazy, this will load the data (data.where is not lazy AFAIK)
     cond = (
         (data["latitude"] >= south)
         & (data["latitude"] <= north)
         & (data["level"] >= level_min)
         & (data["level"] <= level_max)
+        & ((data["longitude"] >= west) | (data["longitude"] <= east))
     )
-
-    # wrapping longitude
-    if west <= east:
-        cond = cond & (data["longitude"] >= west) & (data["longitude"] <= east)
-    else:
-        cond = cond & ((data["longitude"] >= west) | (data["longitude"] <= east))
-
     return data.where(cond, drop=True)