Skip to content

Commit 76c3c92

Browse files
JohnMountJohnMount
committed
rebuild and retest
1 parent f5c3e3e commit 76c3c92

37 files changed

+48577
-48500
lines changed

‎build/lib/data_algebra/cdata.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,10 @@ def rowrecs_to_blocks(
333333
nvals = numpy.asarray(dtemp[dcol])
334334
if len(nvals) < 1:
335335
nvals = [None] * numpy.sum(want)
336-
res.loc[want, vk] = nvals
336+
if numpy.all(want):
337+
res[vk] = nvals # get around Pandas future warning
338+
else:
339+
res.loc[want, vk] = nvals
337340
# see about promoting composite columns to numeric
338341
for vk in set(value_keys):
339342
converted = local_data_model.to_numeric(res[vk], errors="coerce")
@@ -343,7 +346,7 @@ def rowrecs_to_blocks(
343346
res[vk] = converted
344347
if data.shape[0] < 1:
345348
# empty input produces emtpy output (with different column structure)
346-
res = res.iloc[range(0), :].reset_index(drop=True)
349+
res = res.iloc[range(0), :].reset_index(inplace=False, drop=True)
347350
if data.shape[0] <= 0:
348351
res = res.loc[range(0), :]
349352
res = res.reset_index(inplace=False, drop=True)

‎coverage.txt‎

Lines changed: 13 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
============================= test session starts ==============================
2-
platform darwin -- Python 3.7.4, pytest-7.1.2, pluggy-1.0.0
2+
platform darwin -- Python 3.9.15, pytest-7.1.2, pluggy-1.0.0
33
rootdir: /Users/johnmount/Documents/work/data_algebra
4-
plugins: cov-2.12.1, anyio-3.5.0, arraydiff-0.3, remotedata-0.3.2, doctestplus-0.4.0, openfiles-0.4.0
4+
plugins: anyio-3.5.0, cov-3.0.0
55
collected 322 items
66

77
tests/test_OrderedSet.py ...... [ 1%]
@@ -125,153 +125,27 @@ tests/test_window_fns.py ..... [ 98%]
125125
tests/test_with.py .. [ 99%]
126126
tests/test_xicor.py .. [100%]
127127

128-
=============================== warnings summary ===============================
129-
tests/test_OrderedSet.py: 12 warnings
130-
tests/test_agg.py: 4 warnings
131-
tests/test_any_project.py: 4 warnings
132-
tests/test_arith.py: 2 warnings
133-
tests/test_arrow1.py: 6 warnings
134-
tests/test_bigquery_user_fns.py: 2 warnings
135-
tests/test_bitemporal_obs_agg_join.py: 2 warnings
136-
tests/test_braid.py: 2 warnings
137-
tests/test_calc_warnings_errors.py: 2 warnings
138-
tests/test_cc.py: 8 warnings
139-
tests/test_cdata1.py: 8 warnings
140-
tests/test_cdata_convenience.py: 2 warnings
141-
tests/test_cdata_example.py: 6 warnings
142-
tests/test_cdata_wvpy_case.py: 2 warnings
143-
tests/test_coalesce.py: 2 warnings
144-
tests/test_cols_used.py: 2 warnings
145-
tests/test_compare_data_frames.py: 2 warnings
146-
tests/test_complex_expr.py: 8 warnings
147-
tests/test_compound_where.py: 2 warnings
148-
tests/test_concat_rows.py: 6 warnings
149-
tests/test_container.py: 4 warnings
150-
tests/test_cross_product_join.py: 2 warnings
151-
tests/test_dag_elim.py: 22 warnings
152-
tests/test_data_model_isolation.py: 2 warnings
153-
tests/test_db_handle.py: 4 warnings
154-
tests/test_db_model.py: 2 warnings
155-
tests/test_degenerate_project.py: 2 warnings
156-
tests/test_drop_columns.py: 2 warnings
157-
tests/test_eval_cache.py: 6 warnings
158-
tests/test_ex_examples.py: 24 warnings
159-
tests/test_example1.py: 8 warnings
160-
tests/test_exp.py: 2 warnings
161-
tests/test_exp_parens.py: 2 warnings
162-
tests/test_expand_rows.py: 2 warnings
163-
tests/test_expr_parse.py: 2 warnings
164-
tests/test_expression_expectations.py: 4 warnings
165-
tests/test_extend.py: 12 warnings
166-
tests/test_extend_order.py: 2 warnings
167-
tests/test_first_last.py: 2 warnings
168-
tests/test_float_divide.py: 6 warnings
169-
tests/test_flow_text.py: 2 warnings
170-
tests/test_forbidden_calculation.py: 4 warnings
171-
tests/test_forbidden_ops.py: 6 warnings
172-
tests/test_free_fn.py: 2 warnings
173-
tests/test_get_methods_used.py: 2 warnings
174-
tests/test_ghost_col_issue.py: 2 warnings
175-
tests/test_idioms.py: 34 warnings
176-
tests/test_if_else.py: 10 warnings
177-
tests/test_if_else_return_type.py: 2 warnings
178-
tests/test_incomplete_agg.py: 2 warnings
179-
tests/test_join_check.py: 2 warnings
180-
tests/test_join_conditions.py: 6 warnings
181-
tests/test_join_effects.py: 2 warnings
182-
tests/test_join_multi_key.py: 2 warnings
183-
tests/test_join_opt.py: 2 warnings
184-
tests/test_join_variations.py: 2 warnings
185-
tests/test_lark_parser.py: 10 warnings
186-
tests/test_locf.py: 2 warnings
187-
tests/test_logistic_example.py: 2 warnings
188-
tests/test_mapv.py: 4 warnings
189-
tests/test_math.py: 2 warnings
190-
tests/test_method_catalog_issues.py: 4 warnings
191-
tests/test_minimum.py: 2 warnings
192-
tests/test_mod_fns.py: 6 warnings
193-
tests/test_multi_map.py: 2 warnings
194-
tests/test_narrow.py: 2 warnings
195-
tests/test_natural_join.py: 8 warnings
196-
tests/test_neg.py: 2 warnings
197-
tests/test_null_bad.py: 4 warnings
198-
tests/test_one_row_cdata_convert.py: 2 warnings
199-
tests/test_ops.py: 2 warnings
200-
tests/test_ops_eq.py: 2 warnings
201-
tests/test_or.py: 10 warnings
202-
tests/test_order_limit.py: 2 warnings
203-
tests/test_ordered_agg_group.py: 2 warnings
204-
tests/test_parens.py: 4 warnings
205-
tests/test_parse.py: 52 warnings
206-
tests/test_project.py: 10 warnings
207-
tests/test_rank.py: 2 warnings
208-
tests/test_rank_to_average.py: 2 warnings
209-
tests/test_ranked_example.py: 2 warnings
210-
tests/test_readme_example.py: 2 warnings
211-
tests/test_ref_detect.py: 4 warnings
212-
tests/test_rename.py: 12 warnings
213-
tests/test_round.py: 6 warnings
214-
tests/test_scalar_columns.py: 2 warnings
215-
tests/test_scatter_example.py: 2 warnings
216-
tests/test_scoring_example.py: 2 warnings
217-
tests/test_select.py: 6 warnings
218-
tests/test_select_stacking.py: 2 warnings
219-
tests/test_select_values.py: 4 warnings
220-
tests/test_set_quoting.py: 12 warnings
221-
tests/test_shift.py: 4 warnings
222-
tests/test_shorten.py: 2 warnings
223-
tests/test_sign_parse.py: 4 warnings
224-
tests/test_simple.py: 8 warnings
225-
tests/test_simple_expr.py: 2 warnings
226-
tests/test_simplification.py: 4 warnings
227-
tests/test_spark_sql.py: 6 warnings
228-
tests/test_sql_extend_shortening.py: 4 warnings
229-
tests/test_sqlite.py: 28 warnings
230-
tests/test_sqlite_joins.py: 6 warnings
231-
tests/test_std_var.py: 10 warnings
232-
tests/test_str_extend_str_const.py: 10 warnings
233-
tests/test_strat_example.py: 4 warnings
234-
tests/test_sum_cumsum.py: 2 warnings
235-
tests/test_sum_one.py: 2 warnings
236-
tests/test_t_test_example.py: 4 warnings
237-
tests/test_table_is_key_by_columns.py: 2 warnings
238-
tests/test_table_q.py: 2 warnings
239-
tests/test_transform_examples.py: 22 warnings
240-
tests/test_types.py: 2 warnings
241-
tests/test_uniform.py: 4 warnings
242-
tests/test_use.py: 4 warnings
243-
tests/test_user_sql.py: 2 warnings
244-
tests/test_value_behaves_like_column.py: 8 warnings
245-
tests/test_window2.py: 6 warnings
246-
tests/test_window_fns.py: 10 warnings
247-
tests/test_with.py: 4 warnings
248-
tests/test_xicor.py: 4 warnings
249-
/Users/johnmount/opt/anaconda3/lib/python3.7/site-packages/pytest_remotedata/plugin.py:65: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead.
250-
if LooseVersion(pytest.__version__) < LooseVersion("3.6"):
251-
252-
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
253-
254-
---------- coverage: platform darwin, python 3.7.4-final-0 -----------
128+
---------- coverage: platform darwin, python 3.9.15-final-0 ----------
255129
Name Stmts Miss Cover Missing
256130
--------------------------------------------------------------------
257-
data_algebra/BigQuery.py 126 66 48% 21, 27, 131-135, 139, 153-160, 169-178, 183-201, 215-244, 248-261, 272-287
131+
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
258132
data_algebra/MySQL.py 31 8 74% 16-17, 79, 91-97
259133
data_algebra/OrderedSet.py 82 7 91% 33, 46, 49, 55, 58, 61, 64
260134
data_algebra/PostgreSQL.py 30 7 77% 15-16, 69-75
261135
data_algebra/SQLite.py 193 25 87% 91, 101, 127, 141, 143, 155, 171-172, 193, 201, 233, 260, 268-271, 291, 312-316, 448, 489, 494
262-
data_algebra/SparkSQL.py 87 46 47% 13-15, 21-22, 26-28, 89, 94, 132-136, 142-146, 170-172, 178-185, 192-207, 218-223
136+
data_algebra/SparkSQL.py 87 46 47% 16-17, 21-22, 26-28, 89, 94, 132-136, 142-146, 170-172, 178-185, 192-207, 218-223
263137
data_algebra/__init__.py 4 0 100%
264-
data_algebra/arrow.py 137 41 70% 45, 52, 56-57, 66, 69, 73, 92, 96, 102, 113-116, 121, 129, 136, 155, 158, 171-172, 203, 212, 221-234, 237-245, 258, 260, 262, 266, 270
265-
data_algebra/cdata.py 364 66 82% 41, 43, 47, 49, 57, 59-60, 66, 70, 73, 78, 80-83, 91, 99, 103-104, 136, 194, 196, 202, 207, 236, 258, 283, 287, 290-293, 297, 307, 374, 378, 384, 387, 404, 406, 408, 411, 414, 421-423, 440-445, 461, 493, 499-502, 511, 534-539, 550, 585, 606, 611, 616, 621, 625
138+
data_algebra/arrow.py 141 41 71% 45, 52, 56-57, 66, 69, 73, 92, 96, 102, 113-116, 121, 129, 136, 155, 158, 171-172, 203, 212, 221-234, 237-245, 258, 260, 262, 266, 270
139+
data_algebra/cdata.py 366 66 82% 41, 43, 47, 49, 57, 59-60, 66, 70, 73, 78, 80-83, 91, 99, 103-104, 136, 194, 196, 202, 207, 236, 258, 283, 287, 290-293, 297, 307, 377, 381, 387, 390, 407, 409, 411, 414, 417, 424-426, 443-448, 464, 496, 502-505, 514, 537-542, 553, 588, 609, 614, 619, 624, 628
266140
data_algebra/connected_components.py 22 0 100%
267141
data_algebra/data_model.py 13 0 100%
268-
data_algebra/data_ops.py 1331 203 85% 36-37, 56-57, 94, 130, 224, 280, 339, 376, 378, 380, 382, 386, 448, 488, 491, 519, 525, 549, 583, 589, 591, 676, 678, 727, 750, 756, 771, 773, 784, 796, 824, 826, 839, 841, 847, 859, 862, 874, 877, 890, 892, 894, 896, 907, 909, 945, 961, 981, 983, 985, 987, 991, 1026-1034, 1037-1047, 1063, 1087, 1125-1128, 1133, 1137, 1259, 1264, 1269, 1271, 1278, 1280, 1288, 1294, 1296, 1298, 1301, 1304, 1307, 1312, 1329, 1341, 1356, 1399, 1401, 1403, 1405, 1407, 1409, 1449, 1459, 1474, 1549, 1551, 1561, 1567, 1570, 1588, 1598, 1658, 1660, 1662, 1665, 1676, 1749, 1751, 1787-1791, 1795, 1799, 1811, 1863, 1867, 1870, 1872, 1903-1907, 1911, 1913, 1925, 1975, 1980, 1985, 2016-2020, 2024, 2026, 2037, 2088, 2093, 2099, 2102, 2118-2122, 2128, 2130, 2132, 2134, 2146, 2216, 2264-2268, 2272, 2274, 2276, 2287, 2402-2406, 2410, 2412, 2423, 2501, 2516, 2546, 2566, 2568, 2570, 2572, 2583, 2656, 2662, 2664, 2684-2688, 2697, 2699, 2701, 2703, 2714, 2784, 2800-2804, 2808, 2810, 2856, 2936-2944, 2948, 2950, 2952, 2954, 2960
269-
data_algebra/data_ops_types.py 77 10 87% 326, 340-341, 345-349, 354, 362
142+
data_algebra/data_ops.py 1332 203 85% 36-37, 56-57, 94, 130, 224, 280, 339, 376, 378, 380, 382, 386, 448, 488, 491, 519, 525, 549, 583, 589, 591, 676, 678, 727, 750, 756, 771, 773, 784, 796, 824, 826, 839, 841, 847, 859, 862, 874, 877, 890, 892, 894, 896, 907, 909, 945, 961, 981, 983, 985, 987, 991, 1026-1034, 1037-1047, 1063, 1087, 1125-1128, 1133, 1137, 1259, 1264, 1269, 1271, 1278, 1280, 1288, 1294, 1296, 1298, 1301, 1304, 1307, 1312, 1329, 1341, 1356, 1399, 1401, 1403, 1405, 1407, 1409, 1449, 1459, 1474, 1549, 1551, 1561, 1567, 1570, 1588, 1598, 1658, 1660, 1662, 1665, 1676, 1749, 1751, 1787-1791, 1795, 1799, 1811, 1863, 1867, 1870, 1872, 1903-1907, 1911, 1913, 1925, 1975, 1980, 1985, 2016-2020, 2024, 2026, 2037, 2088, 2093, 2099, 2102, 2118-2122, 2128, 2130, 2132, 2134, 2146, 2216, 2264-2268, 2272, 2274, 2276, 2287, 2402-2406, 2410, 2412, 2423, 2501, 2516, 2546, 2566, 2568, 2570, 2572, 2583, 2656, 2662, 2664, 2684-2688, 2697, 2699, 2701, 2703, 2714, 2784, 2800-2804, 2808, 2810, 2856, 2936-2944, 2948, 2950, 2952, 2954, 2960
143+
data_algebra/data_ops_types.py 82 10 88% 326, 340-341, 345-349, 354, 362
270144
data_algebra/data_ops_utils.py 49 5 90% 30, 42, 44, 48, 58
271145
data_algebra/db_model.py 984 87 91% 45, 60, 68-70, 206, 341-342, 422, 849, 861, 921, 926, 948-952, 962, 976-980, 1004, 1016, 1075, 1077, 1083, 1094, 1106, 1138, 1142, 1147, 1180, 1184, 1200, 1203, 1283, 1294, 1299, 1322, 1326, 1367, 1374, 1412, 1416, 1449, 1453, 1475, 1479, 1493, 1533, 1537, 1573, 1577, 1638, 1642, 1644, 1647, 1672, 1751, 1755, 1759, 1762, 1767, 1810, 1821, 1959, 2077-2078, 2096, 2105, 2120, 2126, 2128, 2132, 2141, 2156, 2165, 2206, 2243, 2246, 2253, 2361, 2427-2430, 2435-2436, 2440
272146
data_algebra/eval_cache.py 51 0 100%
273147
data_algebra/expr_parse.py 35 0 100%
274-
data_algebra/expr_rep.py 638 86 87% 205-208, 213, 221, 237, 244, 255, 279, 288-303, 347, 353, 359, 365, 374, 380, 386, 395, 398, 401, 404, 407, 410, 461, 521, 599, 605, 640, 652, 676, 682, 730, 905, 920, 934, 949, 1045, 1060, 1113, 1120-1127, 1133-1134, 1160-1161, 1194, 1201-1202, 1208, 1244, 1246, 1282, 1371, 1385, 1387, 1389, 1392-1398, 1400, 1472, 1486-1488, 1504, 1553
148+
data_algebra/expr_rep.py 642 86 87% 205-208, 213, 221, 237, 244, 255, 279, 288-303, 347, 353, 359, 365, 374, 380, 386, 395, 398, 401, 404, 407, 410, 461, 521, 599, 605, 640, 652, 676, 682, 730, 905, 920, 934, 949, 1045, 1060, 1113, 1120-1127, 1133-1134, 1160-1161, 1194, 1201-1202, 1208, 1244, 1246, 1282, 1371, 1385, 1387, 1389, 1392-1398, 1400, 1472, 1486-1488, 1504, 1553
275149
data_algebra/flow_text.py 17 0 100%
276150
data_algebra/near_sql.py 237 3 99% 41, 256-257
277151
data_algebra/op_catalog.py 3 0 100%
@@ -285,6 +159,7 @@ data_algebra/sql_format_options.py 15 2 87% 61, 69
285159
data_algebra/test_util.py 291 57 80% 88, 110, 120, 123, 127, 150, 153, 157, 159-162, 173, 230-231, 247-252, 256, 268, 270-278, 324, 327, 335, 346, 353, 357, 369, 380, 394, 465-468, 470-473, 475-478, 480-483, 557-562, 568-569, 572
286160
data_algebra/util.py 140 31 78% 26, 51, 56, 61, 84-85, 88-89, 92-93, 96-97, 100-101, 104-105, 108-109, 112-113, 116-117, 120-121, 168, 190, 192, 207, 248, 252, 254
287161
--------------------------------------------------------------------
288-
TOTAL 5943 887 85%
162+
TOTAL 5959 888 85%
163+
289164

290-
================ 322 passed, 644 warnings in 685.14s (0:11:25) =================
165+
======================= 322 passed in 833.63s (0:13:53) ========================

‎dist/data_algebra-1.4.5-py3-none-any.whl‎

43 Bytes
Binary file not shown.

‎dist/data_algebra-1.4.5.tar.gz‎

1.61 KB
Binary file not shown.

0 commit comments

Comments
 (0)