Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ This document explains the changes made to Iris for this release
#. `@bjlittle`_ and `@trexfeathers`_ (reviewer) fixed an issue which prevented
uncompressed PP fields with additional trailing padded words in the field
data to be loaded and saved. (:pull:`5058`)

#. `@lbdreyer`_ and `@trexfeathers`_ (reviewer) fixed the handling of data when
regridding with :class:`~iris.analysis.UnstructuredNearest` or calling
:func:`~iris.analysis.trajectory.interpolate` such that the data type and mask is
Expand Down Expand Up @@ -184,8 +184,8 @@ This document explains the changes made to Iris for this release
details.
(:pull:`4968`)

#. `@trexfeathers`_ introduced the ``netcdf4!=1.6.1`` pin to avoid a problem
with segfaults. (:pull:`4968`)
#. `@trexfeathers`_ introduced the ``netcdf4<1.6.1`` pin to avoid a problem
with segfaults. (:pull:`4968`, :pull:`5075`, :issue:`5016`)

#. `@trexfeathers`_ updated the Matplotlib colormap registration in
:mod:`iris.palette` in response to a deprecation warning. Using the new
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci/py310.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cftime >=1.5
- dask-core >=2.26
- matplotlib >=3.5
- netcdf4 !=1.6.1
- netcdf4 <1.6.1
- numpy >=1.19
- python-xxhash
- pyproj
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci/py38.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cftime >=1.5
- dask-core >=2.26
- matplotlib >=3.5
- netcdf4 !=1.6.1
- netcdf4 <1.6.1
- numpy >=1.19
- python-xxhash
- pyproj
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci/py39.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cftime >=1.5
- dask-core >=2.26
- matplotlib >=3.5
- netcdf4 !=1.6.1
- netcdf4 <1.6.1
- numpy >=1.19
- python-xxhash
- pyproj
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ install_requires =
cftime>=1.5.0
dask[array]>=2.26
matplotlib>=3.5
netcdf4!=1.6.1
netcdf4<1.6.1
numpy>=1.19
scipy
shapely!=1.8.3
Expand Down