Skip to content

Commit 877dc36

Browse files
committed
work around lark change of data structure issue
1 parent d6127ae commit 877dc36

37 files changed

+473
-386
lines changed

build/lib/data_algebra/parse_by_lark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def _r_walk_lark_tree(r_op):
185185
if op_name is None:
186186
raise ValueError("couldn't work out method name")
187187
args = []
188-
if len(r_op.children) > 1:
188+
if (len(r_op.children) > 1) and (r_op.children[1] is not None):
189189
raw_args = r_op.children[1].children
190190
args = [_r_walk_lark_tree(ai) for ai in raw_args]
191191
if var is not None:

coverage.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
============================= test session starts ==============================
2-
platform darwin -- Python 3.9.7, pytest-6.2.4, py-1.10.0, pluggy-0.13.1
2+
platform darwin -- Python 3.9.7, pytest-6.2.5, py-1.11.0, pluggy-1.0.0
33
rootdir: /Users/johnmount/Documents/work/data_algebra
4-
plugins: cov-2.12.1, anyio-2.2.0, typeguard-2.13.0
4+
plugins: anyio-3.5.0, cov-3.0.0
55
collected 300 items
66

77
tests/test_OrderedSet.py ...... [ 2%]
@@ -123,7 +123,7 @@ tests/test_xicor.py .. [100%]
123123

124124
=============================== warnings summary ===============================
125125
tests/test_expression_expectations.py: 19 warnings
126-
/Users/johnmount/opt/anaconda3/envs/ai_academy_3_9/lib/python3.9/site-packages/pyspark/sql/pandas/conversion.py:238: DeprecationWarning: `np.bool` is a deprecated alias for the builtin `bool`. To silence this warning, use `bool` by itself. Doing this will not modify any behavior and is safe. If you specifically wanted the numpy scalar type, use `np.bool_` here.
126+
/Users/johnmount/opt/anaconda3/envs/data_algebra_dev_env/lib/python3.9/site-packages/pyspark/sql/pandas/conversion.py:222: DeprecationWarning: `np.bool` is a deprecated alias for the builtin `bool`. To silence this warning, use `bool` by itself. Doing this will not modify any behavior and is safe. If you specifically wanted the numpy scalar type, use `np.bool_` here.
127127
Deprecated in NumPy 1.20; for more details and guidance: https://numpy.org/devdocs/release/1.20.0-notes.html#deprecations
128128
return np.bool
129129

@@ -165,4 +165,4 @@ data_algebra/util.py 140 29 79% 26, 51, 56, 61, 84-
165165
--------------------------------------------------------------------
166166
TOTAL 5767 710 88%
167167

168-
================ 300 passed, 19 warnings in 1025.68s (0:17:05) =================
168+
================= 300 passed, 19 warnings in 989.07s (0:16:29) =================

data_algebra_dev_env.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: data_algebra_dev_env
2+
channels:
3+
- defaults
4+
- conda-forge
5+
dependencies:
6+
- numpy
7+
- pandas
8+
- lark
9+
- scipy
10+
- jupyterlab
11+
- python=3.9.*
12+
- scikit-learn
13+
- scikit-image
14+
- seaborn
15+
- matplotlib
16+
- PyYAML
17+
- black
18+
- twine
19+
- pytest
20+
- pytest-cov
21+
- twine
22+
- pyarrow
23+
- sqlalchemy
24+
- psycopg2
25+
- pymysql
26+
- pyspark
27+
- pip
28+
- pip:
29+
- pdoc
30+
- google.cloud
31+
- google-cloud-bigquery
32+
4 Bytes
Binary file not shown.

dist/data_algebra-1.4.0.tar.gz

-11 Bytes
Binary file not shown.

docs/data_algebra.html

Lines changed: 14 additions & 11 deletions
Large diffs are not rendered by default.

docs/data_algebra/BigQuery.html

Lines changed: 14 additions & 4 deletions
Large diffs are not rendered by default.

docs/data_algebra/MySQL.html

Lines changed: 14 additions & 4 deletions
Large diffs are not rendered by default.

docs/data_algebra/OrderedSet.html

Lines changed: 14 additions & 4 deletions
Large diffs are not rendered by default.

docs/data_algebra/PostgreSQL.html

Lines changed: 14 additions & 4 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)