Skip to content

Commit e56cc3e

Browse files
committed
rebuid and retest
1 parent ab5c999 commit e56cc3e

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

build/lib/data_algebra/pandas_base.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,8 @@ def blocks_to_rowrecs(self, data, *, blocks_in):
11081108
split = [v for k, v in data.groupby(blocks_in.control_table_keys)]
11091109
else:
11101110
split = [v for k, v in data.groupby(blocks_in.control_table_keys[0])]
1111+
# make sure no row-index bull
1112+
split = [s.reset_index(drop=True, inplace=False) for s in split]
11111113
# check same number of ids for each block
11121114
# could also double check id columns are identical
11131115
for i in range(1, len(split)):

coverage.txt

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
============================= test session starts ==============================
2-
platform darwin -- Python 3.10.10, pytest-7.1.2, pluggy-1.0.0
2+
platform darwin -- Python 3.11.2, pytest-7.1.2, pluggy-1.0.0
33
rootdir: /Users/johnmount/Documents/work/data_algebra
44
plugins: anyio-3.5.0, cov-4.0.0
55
collected 377 items
@@ -131,7 +131,18 @@ tests/test_window_fns.py ..... [ 98%]
131131
tests/test_with.py .. [ 99%]
132132
tests/test_xicor.py .. [100%]
133133

134-
--------- coverage: platform darwin, python 3.10.10-final-0 ----------
134+
=============================== warnings summary ===============================
135+
../../../opt/anaconda3/envs/data_algebra_dev_env/lib/python3.11/site-packages/lark/utils.py:116
136+
/Users/johnmount/opt/anaconda3/envs/data_algebra_dev_env/lib/python3.11/site-packages/lark/utils.py:116: DeprecationWarning: module 'sre_parse' is deprecated
137+
import sre_parse
138+
139+
../../../opt/anaconda3/envs/data_algebra_dev_env/lib/python3.11/site-packages/lark/utils.py:117
140+
/Users/johnmount/opt/anaconda3/envs/data_algebra_dev_env/lib/python3.11/site-packages/lark/utils.py:117: DeprecationWarning: module 'sre_constants' is deprecated
141+
import sre_constants
142+
143+
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
144+
145+
---------- coverage: platform darwin, python 3.11.2-final-0 ----------
135146
Name Stmts Miss Cover Missing
136147
--------------------------------------------------------------------
137148
data_algebra/BigQuery.py 126 67 47% 22-23, 27, 131-135, 139, 153-160, 169-178, 183-201, 215-244, 248-261, 272-287
@@ -159,7 +170,7 @@ data_algebra/expression_walker.py 11 0 100%
159170
data_algebra/flow_text.py 17 0 100%
160171
data_algebra/near_sql.py 237 3 99% 41, 256-257
161172
data_algebra/op_catalog.py 3 0 100%
162-
data_algebra/pandas_base.py 696 68 90% 54, 68, 77, 87, 92, 101, 223, 225, 239, 242, 247, 252, 417, 457, 468, 493, 496, 501, 504, 506, 518, 524-531, 538, 572-577, 607, 611, 614, 616, 653, 707, 748, 765, 785, 803, 813, 828, 876, 884, 892, 907, 918, 930, 949, 964, 992, 1007, 1044, 1061, 1064, 1075, 1103, 1135, 1144, 1171, 1188, 1200, 1255, 1269-1271
173+
data_algebra/pandas_base.py 697 68 90% 54, 68, 77, 87, 92, 101, 223, 225, 239, 242, 247, 252, 417, 457, 468, 493, 496, 501, 504, 506, 518, 524-531, 538, 572-577, 607, 611, 614, 616, 653, 707, 748, 765, 785, 803, 813, 828, 876, 884, 892, 907, 918, 930, 949, 964, 992, 1007, 1044, 1061, 1064, 1075, 1103, 1137, 1146, 1173, 1190, 1202, 1257, 1271-1273
163174
data_algebra/pandas_model.py 19 2 89% 32-33
164175
data_algebra/parse_by_lark.py 164 24 85% 71, 93, 108, 129-130, 137, 161, 171, 185-186, 188, 200, 206, 213-217, 245, 253, 263-266
165176
data_algebra/polars_model.py 597 74 88% 180, 189, 203, 446-452, 458-465, 483-484, 486, 570, 586, 596, 603, 616-620, 628, 630, 655, 658, 663, 666, 715, 733, 749, 816, 832-834, 879, 922, 941, 950, 965, 983, 1001, 1021, 1033-1035, 1038, 1045, 1047, 1054-1066, 1073, 1078, 1109, 1138, 1147, 1175, 1190, 1202
@@ -170,7 +181,6 @@ data_algebra/sql_format_options.py 17 4 76% 61, 68-71
170181
data_algebra/test_util.py 334 59 82% 28-29, 104, 126, 136, 139, 143, 166, 169, 173, 175-178, 189, 264-269, 273, 285, 295, 332, 334, 345, 353, 364, 371, 377, 389, 400, 414, 469, 473, 524-527, 529-532, 534-537, 539-542, 653-658, 663-664, 666
171182
data_algebra/util.py 127 28 78% 26, 59-60, 63-64, 67-68, 71-72, 75-76, 79-80, 83-84, 87-88, 91-92, 95-96, 143, 165, 167, 182, 223, 227, 229
172183
--------------------------------------------------------------------
173-
TOTAL 6737 912 86%
174-
184+
TOTAL 6738 912 86%
175185

176-
======================= 377 passed in 801.16s (0:13:21) ========================
186+
================= 377 passed, 2 warnings in 800.76s (0:13:20) ==================

data_algebra_dev_env.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ channels:
44
- conda-forge
55
dependencies:
66
- numpy
7-
- pandas>=1.0.0
7+
- pandas
88
- lark
99
- scipy
1010
- jupyterlab
11-
- python=3.10.*
11+
- python
1212
- scikit-learn
1313
- seaborn
1414
- matplotlib
20 Bytes
Binary file not shown.

dist/data_algebra-1.6.7.tar.gz

47 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)