dukit 0.2.3__tar.gz → 0.2.4__tar.gz

{dukit-0.2.3 → dukit-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dukit
-Version: 0.2.3
+Version: 0.2.4
 Summary: dukit - data utilities kit for exploring, modifying and visualizing small but messy data using pandas
 Keywords: pandas,query,utility,data,diff
 Author: MartinVoelkl94

{dukit-0.2.3 → dukit-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dukit"
-version = "0.2.3"
+version = "0.2.4"
 description = "dukit - data utilities kit for exploring, modifying and visualizing small but messy data using pandas"
 readme = "README.md"
 authors = [{ name = "MartinVoelkl94", email = "martinv16248@gmail.com" }]

{dukit-0.2.3 → dukit-0.2.4}/src/dukit/excel.py

@@ -20,7 +20,7 @@ def format(
         align_horizontal='left',
         wrap_text=True,
         verbosity=3,
-        ):  #pragma: no cover (does not affect reading of xlsx files)
+        ):
     """
     applies formatting to an Excel file:
     - adjust col width to max length of cell content (accounts for linebreaks)

{dukit-0.2.3 → dukit-0.2.4}/src/dukit/os.py

@@ -262,7 +262,7 @@ def fetch(path, before='now', verbosity=3):
                 timestamp = datetime_(timestamp_str)
                 if timestamp < datetime_(cutoff):
                     timestamps[timestamp] = (timestamp_str, extension)
-            except Exception:  #pragma: no cover
+            except Exception:
                 pass
     if len(timestamps) == 0:
         text = (

{dukit-0.2.3 → dukit-0.2.4}/src/dukit/pandas.py

@@ -544,19 +544,13 @@ def date_delta(
     else:
         df['reference_date'] = df[reference_col].apply(date_)
 
-    cols_reorder = ['reference_date']
-    cols_reorder += [
-        col
-        for col
-        in df.columns
-        if col != 'reference_date'
-        ]
+    cols_reorder = [col for col in df.columns]
     df = df[cols_reorder]
 
     for col in df.columns:
         if col not in cols_dates:
             continue
-        if col == 'reference_date':
+        if col in ['reference_date', reference_col]:
             continue
 
         name = f'days from{linebreak}{reference_col}{linebreak}to{linebreak}{col}'
@@ -586,13 +580,12 @@ def _fix_nas(x):
 
 def date_table(
         df: pd.DataFrame,
-        reference_date: str | datetime.date | pd.Timestamp = None,
         reference_col: str = None,
         uid: str = None,
         upper: int = None,
         lower: int = None,
         start_at_day1: bool = True,
-        schedule: dict = None,
+        schedule: dict[int, str] = None,
         linebreak: str = '\n',
         verbosity: int = 3,
         ) -> pd.DataFrame | pd.io.formats.style.Styler:
@@ -602,28 +595,15 @@ def date_table(
     reference date or column.
     """
 
-    if reference_date is None and reference_col is None:
-        msg = 'ERROR: no reference date or column provided'
+    if reference_col is None:
+        msg = 'ERROR: no reference column provided'
         log(msg, 'dk.date_delta', verbosity)
-        return df
-
-    if reference_date is not None and reference_col is not None:
-        msg = 'ERROR: both reference date and column provided'
-        log(msg, 'dk.date_delta', verbosity)
-        return df
+        return pd.DataFrame()
 
     df = df.copy()
-
     if uid:
         df.index = df[uid]
-
-    if reference_date is not None:
-        reference = pd.Series(
-            date_(reference_date),
-            index=df.index
-            )
-    else:
-        reference = df[reference_col].apply(date_)
+    reference = df[reference_col].apply(date_)
 
     df = (
         df
@@ -659,20 +639,22 @@ def date_table(
 
 
     if upper is None:
-        upper = int(deltas.max().max())
+        upper = int(deltas.max().max()) + 1
     if lower is None:
         lower = int(deltas.min().min())
 
     days = list(range(lower, upper + 1))
     if start_at_day1:
         days.remove(0)
+    else:
+        days.pop(-1)
     days_df = pd.DataFrame({'days': days})
 
     df_timeline = days_df.copy()
     if schedule is not None:
         df_schedule = pd.DataFrame({
-            'days': list(schedule.values()),
-            'planned': list(schedule.keys()),
+            'days': list(schedule.keys()),
+            'planned': list(schedule.values()),
             })
         df_timeline = df_timeline.merge(
             df_schedule,
@@ -722,7 +704,7 @@ def _highlight_schedule(
         schedule: dict,
         ) -> pd.io.formats.style.Styler:
 
-    days_highlight = list(schedule.values())
+    days_highlight = list(schedule.keys())
 
     df_style = pd.DataFrame(
         'text-align: left;',

{dukit-0.2.3 → dukit-0.2.4}/src/dukit/qlang/symbols.py

@@ -4015,6 +4015,7 @@ class SetTypeInfo(Symbol):
     category = 'setter'
     regex = (
         r'\.typeinfo',
+        r'\.type',
         )
 
     #used to validate the current op

{dukit-0.2.3 → dukit-0.2.4}/src/dukit/typing.py

@@ -300,7 +300,7 @@ def date_(x, errors='coerce', na=pd.NaT) -> typing.Any:
         return result.date()
 
     #raise and coerce are handled in _datetime and should not be reached here
-    elif errors == 'raise':  #pragma: no cover
+    elif errors == 'raise':
         raise ValueError(
             f'could not convert "{x}" to datetime.\n'
             'Error handling:\n'
@@ -312,7 +312,7 @@ def date_(x, errors='coerce', na=pd.NaT) -> typing.Any:
     elif errors == 'ignore':
         return x
     elif errors == 'coerce':
-        return na  #pragma: no cover
+        return na
     else:
         return errors
 

{dukit-0.2.3 → dukit-0.2.4}/src/dukit/utils.py

@@ -164,7 +164,7 @@ def log(
         logs.append(message)
 
         #for jupyter
-        if get_ipython().__class__.__name__ == 'ZMQInteractiveShell':  #pragma: no cover
+        if get_ipython().__class__.__name__ == 'ZMQInteractiveShell':
 
             #make html friendly
             message['text'] = (