0.5.0 (#52)

* Specify calling env for verbs internally for 1) better performance and 2) ensurance of pipda.options.assume_all_piping working thoroughly.

* Add forcats

* Add forcats

* Fix linting

* Add tests for forcats

* Fix tests where factor get lost for fct_count() result for pandas < 1.3

* Remove README.rst

Author: pwwang

.gitignore

@@ -116,3 +116,6 @@ docs/*/*.nbconvert.ipynb
 
 # vscode's local history extension
 .history/
+
+# For quick test
+/_t.py

.pre-commit-config.yaml

@@ -26,18 +26,18 @@ repos:
         entry: pylint datar
         types: [python]
         language: system
-    -   id: poetry2setuppy
-        name: Convert pyproject.toml to setup.py
-        entry: dephell deps convert --from=poetry --to=setup.py
-        language: system
-        files: pyproject.toml
-        pass_filenames: false
-    -   id: poetry2requirements
-        name: Convert pyproject.toml to requirements.txt
-        entry: dephell deps convert --from=poetry --to=requirements.txt
-        language: system
-        files: pyproject.toml
-        pass_filenames: false
+    # -   id: poetry2setuppy
+    #     name: Convert pyproject.toml to setup.py
+    #     entry: dephell deps convert --from=poetry --to=setup.py
+    #     language: system
+    #     files: pyproject.toml
+    #     pass_filenames: false
+    # -   id: poetry2requirements
+    #     name: Convert pyproject.toml to requirements.txt
+    #     entry: dephell deps convert --from=poetry --to=requirements.txt
+    #     language: system
+    #     files: pyproject.toml
+    #     pass_filenames: false
     # -   id: mypycheck
     #     name: Type checking by mypy
     #     entry: mypy

.pylintrc

@@ -161,6 +161,7 @@ disable=print-statement,
         fixme,
         consider-using-dict-items,
         unexpected-keyword-arg,
+        consider-using-with,
         C0330
 
 # Enable the message, report, category or checker with the given id(s). You can

README.rst

@@ -7,7 +7,7 @@
 from .core.defaults import f
 
 __all__ = ('f', 'get_versions')
-__version__ = "0.4.4"
+__version__ = "0.5.0"
 
 def get_versions(
     prnt: bool = True

datar/__init__.py

@@ -15,6 +15,7 @@
 from .tibble import *
 from .tidyr import *
 from .utils import *
+from .forcats import *
 
 _builtin_names = _base_builtin_names.copy()
 _builtin_names.update(_dplyr_builtin_names)

datar/all.py

@@ -48,7 +48,10 @@
     factor,
     is_categorical,
     is_factor,
+    is_ordered,
     levels,
+    nlevels,
+    ordered,
 )
 from .funs import (
     cut,
@@ -57,6 +60,7 @@
     identity,
     make_unique,
     make_names,
+    rank,
 )
 from .logical import (
     FALSE,
@@ -75,12 +79,14 @@
     c,
     length,
     lengths,
+    order,
     rep,
     rev,
     sample,
     seq,
     seq_along,
     seq_len,
+    sort,
     unique,
     match,
 )
@@ -123,7 +129,7 @@
     tolower,
     toupper,
 )
-from .table import table
+from .table import table, tabulate
 from .testing import (
     is_atomic,
     is_double,
@@ -155,6 +161,7 @@
     tanpi,
 )
 from .verbs import (
+    append,
     colnames,
     diag,
     dim,
@@ -163,6 +170,8 @@
     names,
     ncol,
     nrow,
+    prop_table,
+    proportions,
     rownames,
     setdiff,
     setequal,

datar/base/__init__.py

@@ -5,6 +5,7 @@
 import numpy
 from pandas import DataFrame, Series
 from pipda import register_func, register_verb
+from pipda.utils import CallingEnvs
 
 from ..core.collections import Collection
 from ..core.contexts import Context
@@ -13,7 +14,7 @@
     NumericOrIter,
     NumericType,
     is_not_null,
-    is_scalar
+    is_scalar,
 )
 from ..core.utils import Array, length_of, recycle_value, register_numpy_func_x
 
@@ -264,11 +265,9 @@ def round(x: NumericOrIter, ndigits: int = 0) -> NumericOrIter:
     """,
 )
 
+
 @register_func(None, context=Context.EVAL)
-def signif(
-    x: NumericOrIter,
-    digits: int = 6
-) -> NumericOrIter:
+def signif(x: NumericOrIter, digits: int = 6) -> NumericOrIter:
     """Rounds the values in its first argument to the specified number of
     significant digits
 
@@ -282,9 +281,10 @@ def signif(
     # todo complex?
     return numpy.fromiter(
         (round(elem, digits - int(ceiling(log10(abs(elem))))) for elem in x),
-        dtype=float
+        dtype=float,
     )
 
+
 # pylint: disable=unused-argument
 @register_verb(DataFrame, context=Context.EVAL)
 def cov(x: DataFrame, y: Iterable = None, ddof: int = 1) -> DataFrame:
@@ -329,11 +329,11 @@ def scale(
     out_attrs = {}
 
     if center is True:
-        center = col_means(x)
+        center = col_means(x, __calling_env=CallingEnvs.REGULAR)
 
     elif center is not False:
         if is_scalar(center):
-            center = [center] # type: ignore
+            center = [center]  # type: ignore
         if len(center) != ncols:
             raise ValueError(
                 f"length of `center` ({len(center)}) must equal "
@@ -351,11 +351,15 @@ def _rms(col: Series) -> Series:
             nonnas = col[is_not_null(col)] ** 2
             return sqrt(nonnas.sum() / (len(nonnas) - 1))
 
-        scale = col_sds(x) if center_is_true else x.agg(_rms)
+        scale = (
+            col_sds(x, __calling_env=CallingEnvs.REGULAR)
+            if center_is_true
+            else x.agg(_rms)
+        )
 
     elif scale is not False:
         if is_scalar(scale):
-            scale = [scale] # type: ignore
+            scale = [scale]  # type: ignore
         if len(scale) != ncols:
             raise ValueError(
                 f"length of `scale` ({len(center)}) must equal "
@@ -571,6 +575,7 @@ def row_medians(
     """
     return x.agg(median, axis=1, na_rm=na_rm)
 
+
 @register_func(None, context=Context.EVAL)
 def log(x: NumericOrIter, base: float = numpy.e) -> FloatOrIter:
     """Computes logarithms, by default natural logarithm
@@ -588,6 +593,7 @@ def log(x: NumericOrIter, base: float = numpy.e) -> FloatOrIter:
 
     return numpy.log(x) / numpy.log(base)
 
+
 exp = register_numpy_func_x(
     "exp",
     "exp",
@@ -598,7 +604,7 @@ def log(x: NumericOrIter, base: float = numpy.e) -> FloatOrIter:
 
     Returns:
         Power of natural number of element-wise power of natural number for x
-    """
+    """,
 )
 
 log2 = register_numpy_func_x(
@@ -612,7 +618,7 @@ def log(x: NumericOrIter, base: float = numpy.e) -> FloatOrIter:
     Returns:
         The value of log2 if x is scalar, otherwise element-wise
         log2 of elements in x
-    """
+    """,
 )
 
 log10 = register_numpy_func_x(
@@ -626,7 +632,7 @@ def log(x: NumericOrIter, base: float = numpy.e) -> FloatOrIter:
     Returns:
         The value of log10 if x is scalar, otherwise element-wise
         log10 of elements in x
-    """
+    """,
 )
 
 log1p = register_numpy_func_x(
@@ -640,5 +646,5 @@ def log(x: NumericOrIter, base: float = numpy.e) -> FloatOrIter:
     Returns:
         The value of log(1+x) if x is scalar, otherwise element-wise
         log(1+x) of elements in x
-    """
+    """,
 )