pycontrails 0.54.0__cp312-cp312-win_amd64.whl → 0.54.2__cp312-cp312-win_amd64.whl

pycontrails/datalib/ecmwf/hres_model_level.py

@@ -13,15 +13,20 @@ from __future__ import annotations
 import contextlib
 import hashlib
 import logging
+import sys
 import warnings
 from datetime import datetime, timedelta
 from typing import Any
 
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
 LOG = logging.getLogger(__name__)
 
 import pandas as pd
 import xarray as xr
-from overrides import overrides
 
 import pycontrails
 from pycontrails.core import cache
@@ -283,7 +288,7 @@ class HRESModelLevel(ECMWFAPI):
         """
         return []
 
-    @overrides
+    @override
     def create_cachepath(self, t: datetime | pd.Timestamp) -> str:
         """Return cachepath to local HRES data file based on datetime.
 
@@ -316,13 +321,13 @@ class HRESModelLevel(ECMWFAPI):
 
         return self.cachestore.path(cache_path)
 
-    @overrides
+    @override
     def download_dataset(self, times: list[datetime]) -> None:
         # will always submit a single MARS request since each forecast is a separate file on tape
         LOG.debug(f"Retrieving ERA5 data for times {times} from forecast {self.forecast_time}")
         self._download_convert_cache_handler(times)
 
-    @overrides
+    @override
     def open_metdataset(
         self,
         dataset: xr.Dataset | None = None,
@@ -348,7 +353,7 @@ class HRESModelLevel(ECMWFAPI):
         self.set_metadata(mds)
         return mds
 
-    @overrides
+    @override
     def set_metadata(self, ds: xr.Dataset | MetDataset) -> None:
         ds.attrs.update(
             provider="ECMWF", dataset="HRES", product="forecast", radiation_accumulated=True

pycontrails/datalib/ecmwf/ifs.py

@@ -4,16 +4,21 @@ from __future__ import annotations
 
 import logging
 import pathlib
+import sys
 import warnings
 from datetime import datetime
 from typing import Any
 
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
 LOG = logging.getLogger(__name__)
 
 import numpy as np
 import pandas as pd
 import xarray as xr
-from overrides import overrides
 
 from pycontrails.core import met
 from pycontrails.datalib._met_utils import metsource
@@ -119,7 +124,7 @@ class IFS(metsource.MetDataSource):
         """
         return None
 
-    @overrides
+    @override
     def open_metdataset(
         self,
         dataset: xr.Dataset | None = None,
@@ -190,7 +195,7 @@ class IFS(metsource.MetDataSource):
         self.set_metadata(ds)
         return met.MetDataset(ds, **kwargs)
 
-    @overrides
+    @override
     def set_metadata(self, ds: xr.Dataset | met.MetDataset) -> None:
         ds.attrs.update(
             provider="ECMWF",
@@ -198,15 +203,15 @@ class IFS(metsource.MetDataSource):
             product="forecast",
         )
 
-    @overrides
+    @override
     def download_dataset(self, times: list[datetime]) -> None:
         raise NotImplementedError("IFS download is not supported")
 
-    @overrides
+    @override
     def cache_dataset(self, dataset: xr.Dataset) -> None:
         raise NotImplementedError("IFS dataset caching not supported")
 
-    @overrides
+    @override
     def create_cachepath(self, t: datetime) -> str:
         raise NotImplementedError("IFS download is not supported")
 

pycontrails/datalib/ecmwf/model_levels.py

@@ -384,9 +384,10 @@ def ml_to_pl(
     lnsp : xr.DataArray
         Natural logarithm of surface pressure, [:math:`\ln(\text{Pa})`]. If provided,
         ``sp`` is ignored. At least one of ``lnsp`` or ``sp`` must be provided.
+        The chunking over dimensions in common with ``ds`` must be the same as ``ds``.
     sp : xr.DataArray
-        Surface pressure, [:math:`\text{Pa}`].
-        At least one of ``lnsp`` or ``sp`` must be provided.
+        Surface pressure, [:math:`\text{Pa}`]. At least one of ``lnsp`` or ``sp`` must be provided.
+        The chunking over dimensions in common with ``ds`` must be the same as ``ds``.
 
     Returns
     -------

pycontrails/datalib/gfs/gfs.py

@@ -9,18 +9,24 @@ References
 
 from __future__ import annotations
 
+import contextlib
 import hashlib
 import logging
 import pathlib
+import sys
 import warnings
 from collections.abc import Callable
 from datetime import datetime
 from typing import TYPE_CHECKING, Any
 
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
 import numpy as np
 import pandas as pd
 import xarray as xr
-from overrides import overrides
 
 import pycontrails
 from pycontrails.core import cache, met
@@ -82,6 +88,9 @@ class GFSForecast(metsource.MetDataSource):
     show_progress : bool, optional
         Show progress when downloading files from GFS AWS Bucket.
         Defaults to False
+    cache_download: bool, optional
+        If True, cache downloaded grib files rather than storing them in a temporary file.
+        By default, False.
 
     Examples
     --------
@@ -116,7 +125,7 @@ class GFSForecast(metsource.MetDataSource):
     - `GFS Documentation <https://www.emc.ncep.noaa.gov/emc/pages/numerical_forecast_systems/gfs/documentation.php>`_
     """
 
-    __slots__ = ("client", "grid", "cachestore", "show_progress", "forecast_time")
+    __slots__ = ("client", "grid", "cachestore", "show_progress", "forecast_time", "cache_download")
 
     #: S3 client for accessing GFS bucket
     client: botocore.client.S3
@@ -142,7 +151,8 @@ class GFSForecast(metsource.MetDataSource):
         forecast_time: DatetimeLike | None = None,
         cachestore: cache.CacheStore | None = __marker,  # type: ignore[assignment]
         show_progress: bool = False,
-    ):
+        cache_download: bool = False,
+    ) -> None:
         try:
             import boto3
         except ModuleNotFoundError as e:
@@ -169,6 +179,7 @@ class GFSForecast(metsource.MetDataSource):
             cachestore = cache.DiskCacheStore()
         self.cachestore = cachestore
         self.show_progress = show_progress
+        self.cache_download = cache_download
 
         if time is None and paths is None:
             raise ValueError("Time input is required when paths is None")
@@ -349,7 +360,7 @@ class GFSForecast(metsource.MetDataSource):
         forecast_hour = str(self.forecast_time.hour).zfill(2)
         return f"gfs.t{forecast_hour}z.pgrb2.{self._grid_string}.f{step_hour}"
 
-    @overrides
+    @override
     def create_cachepath(self, t: datetime) -> str:
         if self.cachestore is None:
             raise ValueError("self.cachestore attribute must be defined to create cache path")
@@ -366,7 +377,7 @@ class GFSForecast(metsource.MetDataSource):
         # return cache path
         return self.cachestore.path(f"{datestr}-{step}-{suffix}.nc")
 
-    @overrides
+    @override
     def download_dataset(self, times: list[datetime]) -> None:
         # get step relative to forecast forecast_time
         logger.debug(
@@ -377,7 +388,7 @@ class GFSForecast(metsource.MetDataSource):
         for t in times:
             self._download_file(t)
 
-    @overrides
+    @override
     def cache_dataset(self, dataset: xr.Dataset) -> None:
         # if self.cachestore is None:
         #     LOG.debug("Cache is turned off, skipping")
@@ -385,7 +396,7 @@ class GFSForecast(metsource.MetDataSource):
 
         raise NotImplementedError("GFS caching only implemented with download")
 
-    @overrides
+    @override
     def open_metdataset(
         self,
         dataset: xr.Dataset | None = None,
@@ -429,7 +440,7 @@ class GFSForecast(metsource.MetDataSource):
         # run the same GFS-specific processing on the dataset
         return self._process_dataset(ds, **kwargs)
 
-    @overrides
+    @override
     def set_metadata(self, ds: xr.Dataset | met.MetDataset) -> None:
         ds.attrs.update(
             provider="NCEP",
@@ -462,24 +473,30 @@ class GFSForecast(metsource.MetDataSource):
         filename = self.filename(t)
         aws_key = f"{self.forecast_path}/{filename}"
 
+        stack = contextlib.ExitStack()
+        if self.cache_download:
+            target = self.cachestore.path(aws_key.replace("/", "-"))
+        else:
+            target = stack.enter_context(temp.temp_file())
+
         # Hold downloaded file in named temp file
-        with temp.temp_file() as temp_grib_filename:
+        with stack:
             # retrieve data from AWS S3
-            logger.debug(f"Downloading GFS file {filename} from AWS bucket to {temp_grib_filename}")
-            if self.show_progress:
-                _download_with_progress(
-                    self.client, GFS_FORECAST_BUCKET, aws_key, temp_grib_filename, filename
-                )
-            else:
-                self.client.download_file(
-                    Bucket=GFS_FORECAST_BUCKET, Key=aws_key, Filename=temp_grib_filename
-                )
+            logger.debug(f"Downloading GFS file {filename} from AWS bucket to {target}")
+            if not self.cache_download or not self.cachestore.exists(target):
+                self._make_download(aws_key, target, filename)
 
-            ds = self._open_gfs_dataset(temp_grib_filename, t)
+            ds = self._open_gfs_dataset(target, t)
 
             cache_path = self.create_cachepath(t)
             ds.to_netcdf(cache_path)
 
+    def _make_download(self, aws_key: str, target: str, filename: str) -> None:
+        if self.show_progress:
+            _download_with_progress(self.client, GFS_FORECAST_BUCKET, aws_key, target, filename)
+        else:
+            self.client.download_file(Bucket=GFS_FORECAST_BUCKET, Key=aws_key, Filename=target)
+
     def _open_gfs_dataset(self, filepath: str | pathlib.Path, t: datetime) -> xr.Dataset:
         """Open GFS grib file for one forecast timestep.
 
@@ -502,7 +519,7 @@ class GFSForecast(metsource.MetDataSource):
         step = pd.Timedelta(t - self.forecast_time) // pd.Timedelta(1, "h")
 
         # open file for each variable short name individually
-        ds: xr.Dataset | None = None
+        da_dict = {}
         for variable in self.variables:
             # Radiation data is not available in the 0th step
             is_radiation_step_zero = step == 0 and variable in (
@@ -519,23 +536,24 @@ class GFSForecast(metsource.MetDataSource):
             else:
                 v = variable
 
-            tmpds = xr.open_dataset(
-                filepath,
-                filter_by_keys={"typeOfLevel": v.level_type, "shortName": v.short_name},
-                engine="cfgrib",
-            )
-
-            if ds is None:
-                ds = tmpds
-            else:
-                ds[v.short_name] = tmpds[v.short_name]
+            try:
+                da = xr.open_dataarray(
+                    filepath,
+                    filter_by_keys={"typeOfLevel": v.level_type, "shortName": v.short_name},
+                    engine="cfgrib",
+                )
+            except ValueError as exc:
+                # To debug this situation, you can use:
+                # import cfgrib
+                # cfgrib.open_datasets(filepath)
+                msg = f"Variable {v.short_name} not found in {filepath}"
+                raise ValueError(msg) from exc
 
-            # set all radiation data to np.nan in the 0th step
             if is_radiation_step_zero:
-                ds = ds.rename({Visibility.short_name: variable.short_name})
-                ds[variable.short_name] = np.nan
+                da = xr.full_like(da, np.nan)  # set all radiation data to np.nan in the 0th step
+            da_dict[variable.short_name] = da
 
-        assert ds is not None, "No variables were loaded from grib file"
+        ds = xr.Dataset(da_dict)
 
         # for pressure levels, need to rename "level" field and downselect
         if self.pressure_levels != [-1]:

pycontrails/datalib/gfs/variables.py

@@ -43,7 +43,9 @@ CloudIceWaterMixingRatio = MetVariable(
 
 
 TOAUpwardShortwaveRadiation = MetVariable(
-    short_name="uswrf",
+    # Note the variable in the GFS Grib file is "uswrf" for the "nominalTop" level
+    # eccodes > 2.38 rewrites to `suswrf` on loading
+    short_name="suswrf",
     standard_name="toa_upward_shortwave_flux",
     long_name="Top of atmosphere upward shortwave radiation",
     units="W m**-2",
@@ -56,7 +58,9 @@ TOAUpwardShortwaveRadiation = MetVariable(
 )
 
 TOAUpwardLongwaveRadiation = MetVariable(
-    short_name="ulwrf",
+    # Note the variable in the GFS Grib file is "ulwrf" for the "nominalTop" level
+    # eccodes > 2.38 rewrites to `sulwrf` on loading
+    short_name="sulwrf",
     standard_name="toa_upward_longwave_flux",
     long_name="Top of atmosphere upward longwave radiation",
     units="W m**-2",

pycontrails/models/cocip/cocip.py

@@ -3,15 +3,20 @@
 from __future__ import annotations
 
 import logging
+import sys
 import warnings
 from collections.abc import Sequence
 from typing import Any, Literal, NoReturn, overload
 
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
 import numpy as np
 import numpy.typing as npt
 import pandas as pd
 import xarray as xr
-from overrides import overrides
 
 from pycontrails.core import met_var
 from pycontrails.core.aircraft_performance import AircraftPerformance
@@ -1218,7 +1223,7 @@ class Cocip(Model):
 
         return self._downwash_contrail.filter(filt)
 
-    @overrides
+    @override
     def _cleanup_indices(self) -> None:
         """Cleanup interpolation artifacts."""
 

pycontrails/models/cocipgrid/cocip_grid.py

@@ -1671,6 +1671,8 @@ def calc_evolve_one_step(
             segment_length_t1, segment_length_t2
         )
 
+    dt = next_contrail["time"] - curr_contrail["time"]
+
     sigma_yy_t2, sigma_zz_t2, sigma_yz_t2 = contrail_properties.plume_temporal_evolution(
         width_t1=width_t1,
         depth_t1=depth_t1,
@@ -1679,7 +1681,7 @@ def calc_evolve_one_step(
         diffuse_h_t1=diffuse_h_t1,
         diffuse_v_t1=diffuse_v_t1,
         seg_ratio=seg_ratio_t12,
-        dt=params["dt_integration"],
+        dt=dt,
         max_depth=params["max_depth"],
     )
 
@@ -1716,7 +1718,7 @@ def calc_evolve_one_step(
         dn_dt_agg=dn_dt_agg,
         dn_dt_turb=dn_dt_turb,
         seg_ratio=seg_ratio_t12,
-        dt=params["dt_integration"],
+        dt=dt,
     )
     next_contrail["n_ice_per_m"] = n_ice_per_m_t2
 
@@ -1737,7 +1739,7 @@ def calc_evolve_one_step(
         width_t1=width_t1,
         width_t2=width_t2,
         seg_length_t2=segment_length_t2,
-        dt=params["dt_integration"],
+        dt=dt,
     )
     # NOTE: This will get masked below if `persistent` is False
     # That is, we are taking a right Riemann sum of a decreasing function, so we are

pycontrails/models/humidity_scaling/humidity_scaling.py

@@ -7,14 +7,19 @@ import contextlib
 import dataclasses
 import functools
 import pathlib
+import sys
 import warnings
 from typing import Any, NoReturn, overload
 
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
 import numpy as np
 import numpy.typing as npt
 import pandas as pd
 import xarray as xr
-from overrides import overrides
 
 from pycontrails.core import models
 from pycontrails.core.met import MetDataArray, MetDataset
@@ -202,7 +207,7 @@ class ConstantHumidityScaling(HumidityScaling):
     default_params = ConstantHumidityScalingParams
     scaler_specific_keys = ("rhi_adj",)
 
-    @overrides
+    @override
     def scale(
         self,
         specific_humidity: ArrayLike,
@@ -254,7 +259,7 @@ class ExponentialBoostHumidityScaling(HumidityScaling):
     default_params = ExponentialBoostHumidityScalingParams
     scaler_specific_keys = "rhi_adj", "rhi_boost_exponent", "clip_upper"
 
-    @overrides
+    @override
     def scale(
         self,
         specific_humidity: ArrayLike,
@@ -408,7 +413,7 @@ class ExponentialBoostLatitudeCorrectionHumidityScaling(HumidityScaling):
         q_method = self.params["interpolation_q_method"]
         return {**super()._scale_kwargs(), "q_method": q_method}
 
-    @overrides
+    @override
     def scale(
         self,
         specific_humidity: ArrayLike,
@@ -557,7 +562,7 @@ class HumidityScalingByLevel(HumidityScaling):
         "stratosphere_threshold",
     )
 
-    @overrides
+    @override
     def scale(
         self,
         specific_humidity: ArrayLike,
@@ -825,7 +830,7 @@ class HistogramMatching(HumidityScaling):
             warnings.warn(msg, DeprecationWarning)
         super().__init__(met, params, **params_kwargs)
 
-    @overrides
+    @override
     def scale(
         self,
         specific_humidity: ArrayLike,
@@ -976,7 +981,7 @@ class HistogramMatchingWithEckel(HumidityScaling):
 
         return self.source
 
-    @overrides
+    @override
     def scale(  # type: ignore[override]
         self,
         specific_humidity: npt.NDArray[np.float64],

pycontrails/models/ps_model/ps_model.py

@@ -5,13 +5,18 @@ from __future__ import annotations
 import dataclasses
 import functools
 import pathlib
+import sys
 from collections.abc import Mapping
 from typing import Any, NoReturn, overload
 
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+
 import numpy as np
 import numpy.typing as npt
 import pandas as pd
-from overrides import overrides
 
 from pycontrails.core import flight
 from pycontrails.core.aircraft_performance import (
@@ -20,6 +25,7 @@ from pycontrails.core.aircraft_performance import (
     AircraftPerformanceData,
     AircraftPerformanceParams,
 )
+from pycontrails.core.fleet import Fleet
 from pycontrails.core.flight import Flight
 from pycontrails.core.met import MetDataset
 from pycontrails.core.met_var import AirTemperature, EastwardWind, NorthwardWind
@@ -115,13 +121,16 @@ class PSFlight(AircraftPerformance):
             raise KeyError(msg)
         return False
 
+    @overload
+    def eval(self, source: Fleet, **params: Any) -> Fleet: ...
+
     @overload
     def eval(self, source: Flight, **params: Any) -> Flight: ...
 
     @overload
     def eval(self, source: None = ..., **params: Any) -> NoReturn: ...
 
-    @overrides
+    @override
     def eval(self, source: Flight | None = None, **params: Any) -> Flight:
         self.update_params(params)
         self.set_source(source)
@@ -130,12 +139,20 @@ class PSFlight(AircraftPerformance):
         self.set_source_met()
 
         # Calculate true airspeed if not included on source
-        true_airspeed = self.ensure_true_airspeed_on_source().copy()
-        true_airspeed[true_airspeed == 0.0] = np.nan
+        self.ensure_true_airspeed_on_source()
+
+        if isinstance(self.source, Fleet):
+            fls = [self._eval_flight(fl) for fl in self.source.to_flight_list()]
+            self.source = Fleet.from_seq(fls, attrs=self.source.attrs, broadcast_numeric=False)
+            return self.source
+
+        self.source = self._eval_flight(self.source)
+        return self.source
 
+    def _eval_flight(self, fl: Flight) -> Flight:
         # Ensure aircraft type is available
         try:
-            aircraft_type = self.source.attrs["aircraft_type"]
+            aircraft_type = fl.attrs["aircraft_type"]
         except KeyError as exc:
             msg = "`aircraft_type` required on flight attrs"
             raise KeyError(msg) from exc
@@ -148,29 +165,32 @@ class PSFlight(AircraftPerformance):
             raise KeyError(msg) from exc
 
         # Set flight attributes based on engine, if they aren't already defined
-        self.source.attrs.setdefault("aircraft_performance_model", self.name)
-        self.source.attrs.setdefault("aircraft_type_ps", atyp_ps)
-        self.source.attrs.setdefault("n_engine", aircraft_params.n_engine)
-
-        self.source.attrs.setdefault("wingspan", aircraft_params.wing_span)
-        self.source.attrs.setdefault("max_mach", aircraft_params.max_mach_num)
-        self.source.attrs.setdefault("max_altitude", units.ft_to_m(aircraft_params.fl_max * 100.0))
-        self.source.attrs.setdefault("n_engine", aircraft_params.n_engine)
-
-        amass_oew = self.source.attrs.get("amass_oew", aircraft_params.amass_oew)
-        amass_mtow = self.source.attrs.get("amass_mtow", aircraft_params.amass_mtow)
-        amass_mpl = self.source.attrs.get("amass_mpl", aircraft_params.amass_mpl)
-        load_factor = self.source.attrs.get("load_factor", DEFAULT_LOAD_FACTOR)
-        takeoff_mass = self.source.attrs.get("takeoff_mass")
-        q_fuel = self.source.fuel.q_fuel
+        fl.attrs.setdefault("aircraft_performance_model", self.name)
+        fl.attrs.setdefault("aircraft_type_ps", atyp_ps)
+        fl.attrs.setdefault("n_engine", aircraft_params.n_engine)
+
+        fl.attrs.setdefault("wingspan", aircraft_params.wing_span)
+        fl.attrs.setdefault("max_mach", aircraft_params.max_mach_num)
+        fl.attrs.setdefault("max_altitude", units.ft_to_m(aircraft_params.fl_max * 100.0))
+        fl.attrs.setdefault("n_engine", aircraft_params.n_engine)
+
+        amass_oew = fl.attrs.get("amass_oew", aircraft_params.amass_oew)
+        amass_mtow = fl.attrs.get("amass_mtow", aircraft_params.amass_mtow)
+        amass_mpl = fl.attrs.get("amass_mpl", aircraft_params.amass_mpl)
+        load_factor = fl.attrs.get("load_factor", DEFAULT_LOAD_FACTOR)
+        takeoff_mass = fl.attrs.get("takeoff_mass")
+        q_fuel = fl.fuel.q_fuel
+
+        true_airspeed = fl["true_airspeed"]  # attached in PSFlight.eval
+        true_airspeed = np.where(true_airspeed == 0.0, np.nan, true_airspeed)
 
         # Run the simulation
         aircraft_performance = self.simulate_fuel_and_performance(
             aircraft_type=atyp_ps,
-            altitude_ft=self.source.altitude_ft,
-            time=self.source["time"],
+            altitude_ft=fl.altitude_ft,
+            time=fl["time"],
             true_airspeed=true_airspeed,
-            air_temperature=self.source["air_temperature"],
+            air_temperature=fl["air_temperature"],
             aircraft_mass=self.get_source_param("aircraft_mass", None),
             thrust=self.get_source_param("thrust", None),
             engine_efficiency=self.get_source_param("engine_efficiency", None),
@@ -194,15 +214,15 @@ class PSFlight(AircraftPerformance):
             "thrust",
             "rocd",
         ):
-            self.source.setdefault(var, getattr(aircraft_performance, var))
+            fl.setdefault(var, getattr(aircraft_performance, var))
 
         self._cleanup_indices()
 
-        self.source.attrs["total_fuel_burn"] = np.nansum(aircraft_performance.fuel_burn).item()
+        fl.attrs["total_fuel_burn"] = np.nansum(aircraft_performance.fuel_burn).item()
 
-        return self.source
+        return fl
 
-    @overrides
+    @override
     def calculate_aircraft_performance(
         self,
         *,

{pycontrails-0.54.0.dist-info → pycontrails-0.54.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.54.0
+Version: 0.54.2
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -29,10 +29,10 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: dask>=2022.3
 Requires-Dist: numpy>=1.22
-Requires-Dist: overrides>=6.1
 Requires-Dist: pandas>=2.2
 Requires-Dist: scipy>=1.10
 Requires-Dist: xarray>=2022.3
+Requires-Dist: typing-extensions>=4.5; python_version < "3.12"
 Provides-Extra: complete
 Requires-Dist: pycontrails[ecmwf,gcp,gfs,jupyter,pyproj,sat,vis,zarr]; extra == "complete"
 Provides-Extra: dev
@@ -67,7 +67,7 @@ Requires-Dist: sphinxext.opengraph>=0.8; extra == "docs"
 Provides-Extra: ecmwf
 Requires-Dist: cdsapi>=0.4; extra == "ecmwf"
 Requires-Dist: cfgrib>=0.9; extra == "ecmwf"
-Requires-Dist: eccodes>=1.4; extra == "ecmwf"
+Requires-Dist: eccodes>=2.38; extra == "ecmwf"
 Requires-Dist: ecmwf-api-client>=1.6; extra == "ecmwf"
 Requires-Dist: netcdf4>=1.6.1; extra == "ecmwf"
 Requires-Dist: platformdirs>=3.0; extra == "ecmwf"
@@ -79,7 +79,8 @@ Requires-Dist: tqdm>=4.61; extra == "gcp"
 Provides-Extra: gfs
 Requires-Dist: boto3>=1.20; extra == "gfs"
 Requires-Dist: cfgrib>=0.9; extra == "gfs"
-Requires-Dist: eccodes>=1.4; extra == "gfs"
+Requires-Dist: eccodes>=2.38; extra == "gfs"
+Requires-Dist: netcdf4>=1.6.1; extra == "gfs"
 Requires-Dist: platformdirs>=3.0; extra == "gfs"
 Requires-Dist: tqdm>=4.61; extra == "gfs"
 Provides-Extra: jupyter