Skip to content

Mergeback 2.2.x #3256

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
bjlittle merged 2 commits into from
Feb 1, 2019
Merged

Mergeback 2.2.x #3256

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
b0d5512
BLD: Pinning cftime to 1.0.1 (#3247)
Feb 1, 2019
c3048cb
Fix for numpy 1v16. (#3257)
pp-mo Feb 1, 2019
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: 4 additions & 2 deletions lib/iris/fileformats/pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,8 +719,10 @@ def _data_bytes_to_shaped_array(data_bytes, lbpack, boundary_packing,
raise iris.exceptions.NotYetImplementedError(
'PP fields with LBPACK of %s are not yet supported.' % lbpack)

# Ensure we have write permission on the data buffer.
data.setflags(write=True)
# Ensure we have a writeable data buffer.
# NOTE: "data.setflags(write=True)" is not valid for numpy >= 1.16.0.
if not data.flags['WRITEABLE']:
data = data.copy()

# Ensure the data is in the native byte order
if not data.dtype.isnative:
Expand Down
2 changes: 1 addition & 1 deletion requirements/core.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cartopy
#conda: proj4<5
cf_units>=2
cftime!=1.0.2.1
cftime==1.0.1
dask[array] #conda: dask
matplotlib>=2,<3
netcdf4
Expand Down