Skip to content

Set iris.FUTURE flags in one place #2622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schlunma merged 2 commits into from
Dec 20, 2024
Merged

Set iris.FUTURE flags in one place #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28582fe
Set iris.FUTURE flags in one place
bouweandela Dec 19, 2024
1adfcb8
Merge branch 'main' into iris-flags
bouweandela Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions esmvalcore/config/_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from importlib.resources import files as importlib_files
from pathlib import Path

import iris
import yaml

from esmvalcore.cmor.table import CMOR_TABLES, read_cmor_tables
Expand All @@ -23,6 +24,17 @@
CFG = {}


# Set iris.FUTURE flags
for attr, value in {
"save_split_attrs": True,
"date_microseconds": True,
}.items():
try:
setattr(iris.FUTURE, attr, value)
except AttributeError:
pass


def _deep_update(dictionary, update):
for key, value in update.items():
if isinstance(value, collections.abc.Mapping):
Expand Down
2 changes: 0 additions & 2 deletions esmvalcore/preprocessor/_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
}
GRIB_FORMATS = (".grib2", ".grib", ".grb2", ".grb", ".gb2", ".gb")

iris.FUTURE.save_split_attrs = True


def _get_attr_from_field_coord(ncfield, coord_name, attr):
if coord_name is not None:
Expand Down