dukit 0.2.4__tar.gz → 0.2.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dukit
-Version: 0.2.4
+Version: 0.2.6
 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.4 → dukit-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dukit"
-version = "0.2.4"
+version = "0.2.6"
 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.4 → dukit-0.2.6}/src/dukit/__init__.py

@@ -1,11 +1,7 @@
 
-from .utils import (
-    log,
-    )
-from .diffing import (
-    diff,
-    rediff,
-    )
+from importlib.metadata import version
+__version__ = version('dukit')
+
 from . import qlang
 from .qlang import (
     q,
@@ -13,23 +9,46 @@ from .qlang import (
     qs,
     )
 from .interfaces import (
-    DukitAccessor,
+    DukitAccessor
+    )
+from .diffing import (
+    diff,
+    rediff,
+    )
+from .utils import (
+    log,
+    ensure_unique_string,
+    )
+from .excel import (
+    format,
+    save,
     )
 from .pandas import (
-    get_df,
-    get_dfs,
+    collapse,
+    date_delta,
+    date_table,
     deduplicate,
+    embed,
     flatten,
+    get_df,
+    get_df_patients,
+    get_df_medications,
+    get_df_old,
+    get_df_new,
     stagger,
-    embed,
-    collapse,
     transpose,
-    date_delta,
-    date_table,
+    split_col,
     )
-from .excel import (
-    format,
-    save,
+from .os import (
+    cd,
+    cp,
+    fetch,
+    isdir,
+    isfile,
+    ispath,
+    mv,
+    mkdir,
+    pwd,
     )
 from .typing import (
     Box,
@@ -44,44 +63,57 @@ from .typing import (
     nk_ as nk,
     yn_ as yn,
     type_ as type,
+    dtype_ as dtype,
     convert_ as convert,
     typeinfo_ as typeinfo,
     typeinfostrict_ as typeinfostrict,
     list_ as list,
     )
-from .os import (
-    pwd,
-    cd,
-    cp,
-    mv,
-    mkdir,
-    isdir,
-    isfile,
-    ispath,
-    fetch,
-    )
+
 
 __all__ = (
-    'log',
-    'diff',
-    'rediff',
+    '__version__',
+
     'qlang',
     'q',
     'qr',
     'qs',
     'DukitAccessor',
-    'get_df',
-    'get_dfs',
+
+    'diff',
+    'rediff',
+
+    'log',
+    'ensure_unique_string',
+
+    'format',
+    'save',
+
+    'collapse',
+    'date_delta',
+    'date_table',
     'deduplicate',
+    'embed',
     'flatten',
+    'get_df',
+    'get_df_patients',
+    'get_df_medications',
+    'get_df_old',
+    'get_df_new',
     'stagger',
-    'embed',
-    'collapse',
     'transpose',
-    'date_delta',
-    'date_table',
-    'format',
-    'save',
+    'split_col',
+
+    'cd',
+    'cp',
+    'fetch',
+    'isdir',
+    'isfile',
+    'ispath',
+    'mv',
+    'mkdir',
+    'pwd',
+
     'Box',
     'str',
     'int',
@@ -94,17 +126,9 @@ __all__ = (
     'nk',
     'yn',
     'type',
+    'dtype',
     'convert',
     'typeinfo',
     'typeinfostrict',
     'list',
-    'pwd',
-    'cd',
-    'cp',
-    'mv',
-    'mkdir',
-    'isdir',
-    'isfile',
-    'ispath',
-    'fetch',
     )

{dukit-0.2.4 → dukit-0.2.6}/src/dukit/_test_utils.py

@@ -1,5 +1,6 @@
 
 import pandas as pd
+
 from .utils import (
     GREEN,
     RED,
@@ -32,51 +33,6 @@ def _setup_xlsx(df_old, df_new, tmpdir):
 
 
 
-def _get_dfs():
-
-    df_old = pd.DataFrame(
-        columns=['a', 'b', 'c'],
-        index=['x', 'y', 'z', ],
-        )
-
-    df_old.insert(0, 'uid', df_old.index)
-
-    df_old.loc['x', 'a'] = 1
-    df_old.loc['x', 'b'] = 1
-    df_old.loc['x', 'c'] = 1
-
-    df_old.loc['y', 'a'] = 2
-    df_old.loc['y', 'b'] = 2
-    df_old.loc['y', 'c'] = 2
-
-    df_old.loc['z', 'a'] = 3
-    df_old.loc['z', 'b'] = None
-    df_old.loc['z', 'c'] = 3
-
-
-    df_new = pd.DataFrame(
-        columns=['d', 'b', 'a'],
-        index=['y', 'x2', 'z', ],
-        )
-
-    df_new.insert(0, 'uid', df_new.index)
-
-    df_new.loc['y', 'd'] = 2
-    df_new.loc['y', 'b'] = 2
-    df_new.loc['y', 'a'] = 0
-
-    df_new.loc['x2', 'd'] = 1
-    df_new.loc['x2', 'b'] = 1
-    df_new.loc['x2', 'a'] = 1
-
-    df_new.loc['z', 'd'] = 3
-    df_new.loc['z', 'b'] = 3
-    df_new.loc['z', 'a'] = pd.NA
-
-    return df_old, df_new
-
-
-
 def _get_expected_new():
 
     uid = pd.Series(
@@ -85,7 +41,7 @@ def _get_expected_new():
         name='uid',
         )
     expected = pd.DataFrame(
-        columns=['uid', 'diff', 'd', 'b', 'a'],
+        columns=['diff', 'uid', 'd', 'b', 'a'],
         index=uid,
         )
 
@@ -120,7 +76,7 @@ def _get_expected_newplus():
         name='uid',
         )
     expected = pd.DataFrame(
-        columns=['uid', 'diff', 'd', 'b', 'b *old', 'a', 'a *old'],
+        columns=['diff', 'uid', 'd', 'b', 'b *old', 'a', 'a *old'],
         index=uid,
         )
 
@@ -164,7 +120,7 @@ def _get_expected_old():
         name='uid',
         )
     expected = pd.DataFrame(
-        columns=['uid', 'diff', 'a', 'b', 'c'],
+        columns=['diff', 'uid', 'a', 'b', 'c'],
         index=uid,
         )
 
@@ -199,7 +155,7 @@ def _get_expected_mix():
         name='uid',
         )
     expected = pd.DataFrame(
-        columns=['uid', 'diff', 'd', 'b', 'a', 'c'],
+        columns=['diff', 'uid', 'd', 'b', 'a', 'c'],
         index=uid,
         )