meerschaum 2.6.7__py3-none-any.whl → 2.6.8rc2__py3-none-any.whl

meerschaum/config/_version.py

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

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/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())]
 
@@ -314,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)
@@ -1256,7 +1262,7 @@ def query_df(
         if debug:
             dprint("Checking for datetime column compatability.")
 
-        from meerschaum.utils.dtypes import are_dtypes_equal, coerce_timezone
+        from meerschaum.utils.dtypes import coerce_timezone
         df_is_dt = are_dtypes_equal(str(df.dtypes[datetime_column]), 'datetime')
         begin_is_int = are_dtypes_equal(str(type(begin)), 'int')
         end_is_int = are_dtypes_equal(str(type(end)), 'int')
@@ -1358,6 +1364,7 @@ def query_df(
         safe_copy=False,
         debug=debug,
         coerce_numeric=False,
+        coerce_timezone=False,
     )
 
     if select_columns == ['*']:

{meerschaum-2.6.7.dist-info → meerschaum-2.6.8rc2.dist-info}/METADATA

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

{meerschaum-2.6.7.dist-info → meerschaum-2.6.8rc2.dist-info}/RECORD

@@ -143,7 +143,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=RLC3HHi_1ndj7ITVDKLD9_uULY3caGRwSz3ATYE-ixA,15014
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=_eF-9HJ3QXep9cgyfLQDypSNV_Vgz5zFRjzI9xg_YZg,71
+meerschaum/config/_version.py,sha256=1d15gQdj0h8xNTpSyy_Rg8wSuvMRXD4-k5H2-i8OogE,74
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=2UukC0Lmk-aVL1o1qXzumqmuIrw3vu9fD7iCuz4XD4I,10544
@@ -196,7 +196,7 @@ meerschaum/core/Pipe/_attributes.py,sha256=hvnt1kCdqn9UQU86jMTJ9kDYXJ4hC3Cc48wVX
 meerschaum/core/Pipe/_bootstrap.py,sha256=evyi07kkzAVMj66HfZkbYdcWk_oHUDsl6f13EnSPMYs,7723
 meerschaum/core/Pipe/_clear.py,sha256=LghXabgyyc1tD7FNQrh9ExT71ipcg2poM9FDA3k9e4M,2230
 meerschaum/core/Pipe/_copy.py,sha256=YDclAapf_spm9phpFr4-CALyYyw7nUsyKyiaLM1cnm4,2965
-meerschaum/core/Pipe/_data.py,sha256=BTmk2WIO3Ad9mrq47aIJzUD6cd5jj9UBjNm--6m9RaM,24259
+meerschaum/core/Pipe/_data.py,sha256=HOvKlpD9NiBg599mSH1lzUQ_2g8-PsnMbGzMTOJx81E,24047
 meerschaum/core/Pipe/_deduplicate.py,sha256=xthUdsDxGO2t3m0XGDm9K3F6dpaZoemtjNi8gyKm0e0,10177
 meerschaum/core/Pipe/_delete.py,sha256=1geNp9BgrocXP1gt76dMbnlJWKYFMuSNqPFA4K4-hXE,2118
 meerschaum/core/Pipe/_drop.py,sha256=qj5L0obDh2_dKAg7LD3WLI3_L0Q5YECTfTmPc8zZUxI,1135
@@ -219,7 +219,7 @@ meerschaum/plugins/__init__.py,sha256=6krcqaMKyzuVqesXMqEL0XEy2SJQ4xfNt2-oI_fJ6v
 meerschaum/plugins/bootstrap.py,sha256=VwjpZAuYdqPJW0YoVgAoM_taHkdQHqP902-8T7OWWCI,11339
 meerschaum/utils/__init__.py,sha256=QrK1K9hIbPCRCM5k2nZGFqGnrqhA0Eh-iSmCU7FG6Cs,612
 meerschaum/utils/_get_pipes.py,sha256=tu4xKPoDn79Dz2kWM13cXTP4DSCkn-3G9M8KiLftopw,11073
-meerschaum/utils/dataframe.py,sha256=ZLv5QZHtAixaBWUmBCILFoA0ArFPEwrwlIbtL2FzJHM,43419
+meerschaum/utils/dataframe.py,sha256=RByfxVec8qv8-zSffTiLavGjG4FII0gehPFX0wcLhmM,43672
 meerschaum/utils/debug.py,sha256=GyIzJmunkoPnOcZNYVQdT4Sgd-aOb5MI2VbIgATOjIQ,3695
 meerschaum/utils/interactive.py,sha256=t-6jWozXSqL7lYGDHuwiOjTgr-UKhdcg61q_eR5mikI,3196
 meerschaum/utils/misc.py,sha256=soGmUooT216Dl15KbcUTzf8E-aC6uNM6Zvy1PiUT_Y4,47089
@@ -251,11 +251,11 @@ meerschaum/utils/packages/_packages.py,sha256=IFcQ4MzmTqjdWkqOsUa25xUNmG246TFqe2
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=f3oi67lXYPLKJrnRW9lae7M3A8SFiC7DzaMoBdCVUFs,24609
-meerschaum-2.6.7.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.6.7.dist-info/METADATA,sha256=jfFW7xnLFU6XBON2LGdhq2gvpFF5s-8fmNwrI30xetE,24757
-meerschaum-2.6.7.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.6.7.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-meerschaum-2.6.7.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.6.7.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.6.7.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.6.7.dist-info/RECORD,,
+meerschaum-2.6.8rc2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.6.8rc2.dist-info/METADATA,sha256=8LbzIT9jYfpPs_L7hJUE88SbMKu77Jcqwx9tdNcFwvM,24760
+meerschaum-2.6.8rc2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.6.8rc2.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+meerschaum-2.6.8rc2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.6.8rc2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.6.8rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.6.8rc2.dist-info/RECORD,,