pandas 0.25.0: paper over a strictness change in index unions

see pandas-dev/pandas#28034

We switch every timezone-aware series into utc now.

Author: zogzog

test/test_tsio.py

@@ -1543,7 +1543,7 @@ def test_insert_errors(engine, tsh):
                    index=pd.date_range(start=utcdt(2018, 1, 1),
                                        freq='D', periods=3))
 
-    with pytest.raises(AssertionError):
+    with pytest.raises(TypeError):
         tsh.insert(engine, 42, 'error', 'Babar')
 
     with pytest.raises(AssertionError):

tshistory/tsio.py

@@ -55,12 +55,12 @@ def insert(self, cn, newts, name, author,
         author: str free-form author name
         metadata: optional dict for changeset metadata
         """
+        if not len(newts):
+            return
         newts = self._guard_insert(
             newts, name, author, metadata,
             _insertion_date
         )
-        if not len(newts):
-            return
 
         assert ('<M8[ns]' == newts.index.dtype or
                 'datetime' in str(newts.index.dtype) and not
@@ -441,11 +441,14 @@ def _guard_insert(self, newts, name, author, metadata, insertion_date):
         assert (insertion_date is None or
                 isinstance(insertion_date, datetime)), 'Bad format for insertion date'
         assert isinstance(newts, pd.Series), 'Not a pd.Series'
-        assert not newts.index.duplicated().any(), 'There are some duplicates in the index'
+        index = newts.index
+        assert not index.duplicated().any(), 'There are some duplicates in the index'
 
-        assert newts.index.notna().all(), 'The index contains NaT entries'
-        if not newts.index.is_monotonic_increasing:
+        assert index.notna().all(), 'The index contains NaT entries'
+        if not index.is_monotonic_increasing:
             newts = newts.sort_index()
+        if index.tz is not None:
+           newts.index = index.tz_convert('UTC')
 
         return num2float(newts)
 

tshistory/util.py

@@ -146,10 +146,12 @@ class SeriesServices(object):
     def patch(self, base, diff):
         assert base is not None
         assert diff is not None
-        newindex = base.index.union(diff.index).sort_values()
+        basei = base.index
+        diffi = diff.index
+        newindex = basei.union(diffi).sort_values()
         patched = pd.Series([0] * len(newindex), index=newindex)
-        patched[base.index] = base
-        patched[diff.index] = diff
+        patched[basei] = base
+        patched[diffi] = diff
         patched.name = base.name
         return patched