rebuld and retest

Author: JohnMount

build/lib/data_algebra/data_model.py

@@ -140,7 +140,7 @@ def populate_impl_map(data_model):
         "is_bad": data_model.bad_column_positions,
         "is_in": _type_safe_is_in,
         "concat": lambda a, b: numpy.char.add(
-            numpy.asarray(a, dtype=numpy.str), numpy.asarray(b, dtype=numpy.str)
+            numpy.asarray(a, dtype=str), numpy.asarray(b, dtype=str)
         ),
         "coalesce": lambda a, b: _coalesce(a, b),  # assuming Pandas series
         "connected_components": lambda a, b: data_algebra.connected_components.connected_components(

build/lib/data_algebra/pandas_base.py

@@ -281,7 +281,7 @@ def promote_scalar(v):
         missing_group_cols = set(op.group_by) - set(res.columns)
         assert len(missing_group_cols) <= 0
         if "_data_table_temp_col" in res.columns:
-            res = res.drop("_data_table_temp_col", 1)
+            res = res.drop("_data_table_temp_col", axis=1, inplace=False)
         # double check shape is what we expect
         if not data_algebra.util.table_is_keyed_by_columns(res, op.group_by):
             raise ValueError("result wasn't keyed by group_by columns")
@@ -402,7 +402,7 @@ def natural_join_step(self, op, *, data_map, narrow):
             if c not in op.by:
                 is_null = res[c].isnull()
                 res.loc[is_null, c] = res.loc[is_null, c + "_tmp_right_col"]
-                res = res.drop(c + "_tmp_right_col", axis=1)
+                res = res.drop(c + "_tmp_right_col", axis=1, inplace=False)
         res = res.reset_index(drop=True)
         return res
 

coverage.txt

@@ -1,7 +1,7 @@
 ============================= test session starts ==============================
-platform darwin -- Python 3.9.4, pytest-6.2.3, py-1.10.0, pluggy-0.13.1
+platform darwin -- Python 3.8.10, pytest-6.2.4, py-1.10.0, pluggy-0.13.1
 rootdir: /Users/johnmount/Documents/work/data_algebra
-plugins: anyio-2.2.0, cov-2.11.1
+plugins: cov-2.12.1, anyio-2.2.0
 collected 192 items
 
 tests/test_OrderedSet.py .                                               [  0%]
@@ -81,13 +81,13 @@ tests/test_window2.py ...                                                [ 96%]
 tests/test_window_fns.py .....                                           [ 98%]
 tests/test_with.py ..                                                    [100%]
 
----------- coverage: platform darwin, python 3.9.4-final-0 -----------
+---------- coverage: platform darwin, python 3.8.10-final-0 ----------
 Name                                   Stmts   Miss  Cover
 ----------------------------------------------------------
-data_algebra/BigQuery.py                 105     68    35%
-data_algebra/MySQL.py                     28     10    64%
+data_algebra/BigQuery.py                 105     67    36%
+data_algebra/MySQL.py                     28      9    68%
 data_algebra/OrderedSet.py                53      7    87%
-data_algebra/PostgreSQL.py                18      7    61%
+data_algebra/PostgreSQL.py                18      6    67%
 data_algebra/SQLite.py                    66      8    88%
 data_algebra/SparkSQL.py                  68     43    37%
 data_algebra/__init__.py                   6      0   100%
@@ -99,7 +99,7 @@ data_algebra/data_ops.py                1125    193    83%
 data_algebra/data_ops_types.py            85     38    55%
 data_algebra/data_ops_utils.py            51      7    86%
 data_algebra/db_model.py                 868     97    89%
-data_algebra/diagram.py                   56     44    21%
+data_algebra/diagram.py                   56     43    23%
 data_algebra/eval_model.py                16      1    94%
 data_algebra/expr_parse.py                32      0   100%
 data_algebra/expr_rep.py                 562    102    82%
@@ -113,7 +113,7 @@ data_algebra/python3_lark.py               1      0   100%
 data_algebra/test_util.py                175     25    86%
 data_algebra/util.py                      78      8    90%
 ----------------------------------------------------------
-TOTAL                                   4718    879    81%
+TOTAL                                   4718    875    81%
 
 
-============================= 192 passed in 16.32s =============================
+============================= 192 passed in 14.09s =============================