Skip to content

Netcdftime dep #3017

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
pelson merged 4 commits into from
May 16, 2018
Merged

Netcdftime dep #3017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67db5d8
Add netcdftime as a dependency
lbdreyer May 10, 2018
b546f45
Pin to netcdf4 1.3 or below
lbdreyer May 10, 2018
612bb04
Tiny change to fix for pandas v0.23
pp-mo May 16, 2018
0f1a37b
Fix licence header.
pp-mo May 16, 2018
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
4 changes: 2 additions & 2 deletions lib/iris/pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2013 - 2017, Met Office
# (C) British Crown Copyright 2013 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -55,7 +55,7 @@ def _add_iris_coord(cube, name, points, dim, calendar=None):

# Convert pandas datetime objects to python datetime obejcts.
if isinstance(points, DatetimeIndex):
points = np.array([i.to_datetime() for i in points])
points = np.array([i.to_pydatetime() for i in points])
Copy link
Member

@pelson pelson May 16, 2018

Choose a reason for hiding this comment

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

Looks sensible: https://pandas.pydata.org/pandas-docs/stable/generated/pandas.DatetimeIndex.to_pydatetime.html#pandas.DatetimeIndex.to_pydatetime


# Convert datetime objects to Iris' current datetime representation.
if points.dtype == object:
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 @@ -5,7 +5,7 @@

cartopy
matplotlib<1.9
netcdf4
netcdf4<1.4
numpy
scipy
# pyke (not pip installable) #conda: pyke
Expand Down