meerschaum 2.6.6__tar.gz → 2.6.8rc1__tar.gz

{meerschaum-2.6.6/meerschaum.egg-info → meerschaum-2.6.8rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.6.6
+Version: 2.6.8rc1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.6.6 → meerschaum-2.6.8rc1}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.6.6"
+__version__ = "2.6.8rc1"

{meerschaum-2.6.6 → meerschaum-2.6.8rc1}/meerschaum/core/Pipe/_data.py

@@ -313,7 +313,6 @@ def _get_data_as_iterator(
     Return a pipe's data as a generator.
     """
     from meerschaum.utils.misc import round_time
-    from meerschaum.utils.dtypes import coerce_timezone
     begin, end = self.parse_date_bounds(begin, end)
     if not self.exists(debug=debug):
         return
@@ -326,15 +325,11 @@ def _get_data_as_iterator(
         if begin is not None
         else self.get_sync_time(round_down=False, newest=False, params=params, debug=debug)
     ) if dt_col else None
-    if isinstance(min_dt, datetime):
-        min_dt = coerce_timezone(min_dt)
     max_dt = (
         end
         if end is not None
         else self.get_sync_time(round_down=False, newest=True, params=params, debug=debug)
     ) if dt_col else None
-    if isinstance(max_dt, datetime):
-        max_dt = coerce_timezone(max_dt)
 
     ### We want to search just past the maximum value.
     if end is None:

{meerschaum-2.6.6 → meerschaum-2.6.8rc1}/meerschaum/utils/dataframe.py

@@ -194,7 +194,7 @@ def filter_unseen_df(
         warn(
             "Was not able to cast old columns onto new DataFrame. " +
             f"Are both DataFrames the same shape? Error:\n{e}",
-            stacklevel = 3,
+            stacklevel=3,
         )
         return new_df[list(new_df_dtypes.keys())]
 
@@ -234,10 +234,13 @@ def filter_unseen_df(
     cast_dt_cols = True
     try:
         for col, typ in dt_dtypes.items():
+            strip_utc = (
+                (dtypes or {}).get(col, 'datetime') == 'datetime64[ns]'
+            )
             if col in old_df.columns:
-                old_df[col] = coerce_timezone(old_df[col])
+                old_df[col] = coerce_timezone(old_df[col], strip_utc=strip_utc)
             if col in new_df.columns:
-                new_df[col] = coerce_timezone(new_df[col])
+                new_df[col] = coerce_timezone(new_df[col], strip_utc=strip_utc)
         cast_dt_cols = False
     except Exception as e:
         warn(f"Could not cast datetime columns:\n{e}")
@@ -311,15 +314,21 @@ def filter_unseen_df(
         if are_dtypes_equal(str(typ), 'datetime')
     ]
     for col in old_dt_cols:
-        old_df[col] = coerce_timezone(old_df[col])
+        strip_utc = (
+            (dtypes or {}).get(col, 'datetime') == 'datetime64[ns]'
+        )
+        old_df[col] = coerce_timezone(old_df[col], strip_utc=strip_utc)
 
     new_dt_cols = [
         col
-        for col, typ in old_df.dtypes.items()
+        for col, typ in new_df.dtypes.items()
         if are_dtypes_equal(str(typ), 'datetime')
     ]
     for col in new_dt_cols:
-        new_df[col] = coerce_timezone(new_df[col])
+        strip_utc = (
+            (dtypes or {}).get(col, 'datetime') == 'datetime64[ns]'
+        )
+        new_df[col] = coerce_timezone(new_df[col], strip_utc=strip_utc)
 
     old_uuid_cols = get_uuid_cols(old_df)
     new_uuid_cols = get_uuid_cols(new_df)

{meerschaum-2.6.6 → meerschaum-2.6.8rc1/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.6.6
+Version: 2.6.8rc1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.6.6 → meerschaum-2.6.8rc1}/tests/test_pipes_dtypes.py

@@ -756,6 +756,9 @@ def test_parse_date_bounds(flavor: str):
     success, msg = pipe.sync([{'ts': '2024-01-01'}], debug=debug)
     assert success, msg
 
+    success, msg = pipe.sync([{'ts': '2024-01-02'}], debug=debug)
+    assert success, msg
+
     naive_begin = datetime(2024, 1, 1)
     naive_end = datetime(2024, 1, 2)
     aware_begin = datetime(2024, 1, 1, tzinfo=timezone.utc)
@@ -783,6 +786,9 @@ def test_parse_date_bounds(flavor: str):
     success, msg = pipe.sync([{'ts': '2024-01-01'}], debug=debug)
     assert success, msg
 
+    success, msg = pipe.sync([{'ts': '2024-01-02'}], debug=debug)
+    assert success, msg
+
     begin, end = pipe.parse_date_bounds(naive_begin, naive_end)
     assert begin.tzinfo is None
     assert end.tzinfo is None