Merge pull request #376 from informatics-lab/earth-networks-image

EarthNetworks images
MetOffice · May 15, 2020 · ed8505c · ed8505c
2 parents 8020b10 + 49df06c
commit ed8505c
Show file tree

Hide file tree

Showing 5 changed files with 405 additions and 73 deletions.
diff --git a/forest/__init__.py b/forest/__init__.py
@@ -23,7 +23,7 @@
 .. automodule:: forest.presets
 
 """
-__version__ = '0.16.4'
+__version__ = '0.17.0'
 
 from .config import *
 from . import (

diff --git a/forest/db/control.py b/forest/db/control.py
@@ -2,6 +2,7 @@
 import copy
 import datetime as dt
 import numpy as np
+import pandas as pd
 import bokeh.models
 import bokeh.layouts
 from collections import namedtuple
@@ -117,7 +118,11 @@ def time_array_equal(x, y):
         return False
     elif (len(x) == 0) or (len(y) == 0):
         return x == y
-    return np.all(_vto_datetime(x) == _vto_datetime(y))
+    try:
+        return np.all(_vto_datetime(x) == _vto_datetime(y))
+    except TypeError:
+        # NOTE: Needed for EarthNetworks DatetimeIndex
+        return np.all(pd.to_datetime(x) == pd.to_datetime(y))
 
 def equal_value(a, b):
     if (a is None) and (b is None):