dppd 0.26__tar.gz → 0.27__tar.gz

{dppd-0.26/src/dppd.egg-info → dppd-0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dppd
-Version: 0.26
+Version: 0.27
 Summary: A pythonic dplyr clone
 Home-page: https://github.com/TyberiusPrime/dppd
 Author: Florian Finkernagel

{dppd-0.26 → dppd-0.27}/setup.cfg

@@ -1,12 +1,12 @@
 [metadata]
 name = dppd
 description = A pythonic dplyr clone
-version = 0.26
+version = 0.27
 author = Florian Finkernagel
-author-email = finkernagel@imt.uni-marburg.de
+author_email = finkernagel@imt.uni-marburg.de
 license = mit
 url = https://github.com/TyberiusPrime/dppd
-long-description = file: README.md
+long_description = file: README.md
 long_description_content_type = text/markdown
 platforms = any
 classifiers = 

{dppd-0.26 → dppd-0.27}/src/dppd/__init__.py

@@ -4,6 +4,6 @@ from .base import dppd, register_verb, register_type_methods_as_verbs
 from . import single_verbs  # noqa:F401
 from . import non_df_verbs  # noqa:F401
 
-__version__ = "0.26"
+__version__ = "0.27"
 
 __all_ = [dppd, register_verb, register_type_methods_as_verbs, __version__]

{dppd-0.26 → dppd-0.27}/src/dppd/single_verbs.py

@@ -939,7 +939,7 @@ def to_frame_dict(d, **kwargs):
 
 
 @register_verb("norm_0_to_1", types=pd.DataFrame)
-def norm_0_to_1(df, axis=1):
+def norm_0_to_1(df, axis=1, keep_nan=False):
     """Normalize a (numeric) data frame so that
     it goes from 0 to 1 in each row (axis=1) or column (axis=0)
     Usefully for PCA, correlation, etc. because then
@@ -951,7 +951,9 @@ def norm_0_to_1(df, axis=1):
         a1 = 0
         a2 = 1
     df_normed = df.sub(df.min(axis=a1), axis=a2)
-    df_normed = df.div(df.max(axis=a1), axis=a2)
+    df_normed = df.div(df_normed.max(axis=a1), axis=a2)
+    if not keep_nan:
+        df_normed = df_normed[~pd.isnull(df_normed).any(axis=1)]
     return df_normed
 
 
@@ -1000,7 +1002,12 @@ def pca_dataframe(df, whiten=False, random_state=None, n_components=2):
 
     p = PCA(n_components=n_components, whiten=whiten, random_state=random_state)
     df_fit = pd.DataFrame(p.fit_transform(df))
-    df_fit.columns = ["1st", "2nd"]
+    cols = ["1st", "2nd"]
+    if n_components > 2:
+        cols.append('3rd')
+    for ii in range(3, n_components):
+        cols.append(f"{ii+1}th")
+    df_fit.columns = cols
     df_fit.index = df.index
     df_fit.index.name = "sample"
     df_fit = df_fit.reset_index()
@@ -1012,7 +1019,6 @@ def pca_dataframe(df, whiten=False, random_state=None, n_components=2):
 
 @register_verb("insert", types=pd.DataFrame, ignore_redefine=True)
 def insert_return_self(df, loc, column, value, **kwargs):
-    """DataFrame.insert, but return self.
-    """
+    """DataFrame.insert, but return self."""
     df.insert(loc, column, value, **kwargs)
     return df

{dppd-0.26 → dppd-0.27/src/dppd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dppd
-Version: 0.26
+Version: 0.27
 Summary: A pythonic dplyr clone
 Home-page: https://github.com/TyberiusPrime/dppd
 Author: Florian Finkernagel