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
2 changes: 1 addition & 1 deletion lib/iris/fileformats/pp_load_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def _convert_time_coords(
def date2hours(t):
epoch_hours = _epoch_date_hours(epoch_hours_unit, t)
if t.minute == 0 and t.second == 0:
epoch_hours = round(epoch_hours)
epoch_hours = np.around(epoch_hours)
return epoch_hours

def date2year(t_in):
Expand Down
2 changes: 1 addition & 1 deletion requirements/core.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cartopy>=0.12
cf-units>=2
cftime==1.1.3
dask[array]>=2 #conda: dask>=2
matplotlib
matplotlib<3.3
Copy link
Member

@bjlittle bjlittle Jul 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stephenworsley Happy with the temporary pin here, and we can address these test failures separately

netcdf4
numpy>=1.14
scipy