Commit 5aa5301e authored by Klaus Zimmermann's avatar Klaus Zimmermann
Browse files

Update iris (closes #217)

parent e9db9bd1
......@@ -4,7 +4,7 @@ import logging
import time
import iris
from iris.experimental.equalise_cubes import equalise_attributes
from iris.util import equalise_attributes
import netCDF4
import numpy as np
......
......@@ -21,7 +21,7 @@ def multicube_aggregated_by(cubes, coords, aggregator, **kwargs):
ref_cube = next(iter(cubes.values()))
coords = ref_cube._as_list_of_coords(coords)
for coord in sorted(coords, key=lambda coord: coord._as_defn()):
for coord in sorted(coords, key=lambda coord: coord.metadata):
if coord.ndim > 1:
msg = (
"Cannot aggregate_by coord %s as it is "
......@@ -142,7 +142,7 @@ def multicube_aggregated_by(cubes, coords, aggregator, **kwargs):
for coord in groupby.coords:
if (
dim_coord is not None
and dim_coord._as_defn() == coord._as_defn()
and dim_coord.metadata == coord.metadata
and isinstance(coord, iris.coords.DimCoord)
):
aggregateby_cube.add_dim_coord(
......
......@@ -5,5 +5,5 @@ channels:
- conda-forge
dependencies:
- iris>=2.2.0,<3
- iris>=3.0.2,<4
- numba
......@@ -41,7 +41,7 @@ setuptools.setup(
'PyYAML',
'regex',
'sentry-sdk',
'scitools-iris>=2.2.0,<3',
'scitools-iris>=3,<4',
'sparse',
],
entry_points={
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment