interval: please pandas 0.25

Author: zogzog

test/test_tsio.py

@@ -150,7 +150,8 @@ def test_differential(engine, tsh):
     assert not tsh.exists(engine, 'this_does_not_exist')
 
     assert tsh.interval(engine, 'ts_test') == pd.Interval(
-        datetime(2010, 1, 1, 0, 0), datetime(2010, 1, 10, 0, 0),
+        pd.Timestamp(datetime(2010, 1, 1, 0, 0)),
+        pd.Timestamp(datetime(2010, 1, 10, 0, 0)),
         closed='both'
     )
 
@@ -244,7 +245,8 @@ def test_differential(engine, tsh):
 """, tsh.get(engine, 'ts_test'))
 
     assert tsh.interval(engine, 'ts_test') == pd.Interval(
-        datetime(2010, 1, 1, 0, 0), datetime(2010, 1, 17, 0, 0),
+        pd.Timestamp(datetime(2010, 1, 1, 0, 0)),
+        pd.Timestamp(datetime(2010, 1, 17, 0, 0)),
         closed='both'
     )
 

tshistory/tsio.py

@@ -423,8 +423,10 @@ def interval(self, cn, name, notz=False):
                f'order by id desc limit 1')
         res = cn.execute(sql).fetchone()
         start, end = res.tsstart, res.tsend
+        tz = None
         if self.metadata(cn, name).get('tzaware') and not notz:
-            start, end = pd.Timestamp(start, tz='UTC'), pd.Timestamp(end, tz='UTC')
+            tz = 'UTC'
+        start, end = pd.Timestamp(start, tz=tz), pd.Timestamp(end, tz=tz)
         return pd.Interval(left=start, right=end, closed='both')
 
     # /API