Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
petewa committed Aug 10, 2016
1 parent 1a2436c commit bef2d2c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
'toolz',
'xarray',
'scipy',
'pyparsing==2.1.4',
'pyparsing==2.1.5',
'matplotlib',
'numexpr',
'future',
Expand Down
8 changes: 4 additions & 4 deletions tests/analytics_execution_engine/test_ndexpr.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ def test_2():
assert ne.test("percentile(z1, 50)", np.percentile(z1, 50))
assert ne.test("percentile(z1, 50)+percentile(z1, 50)", np.percentile(z1, 50) + np.percentile(z1, 50))
assert ne.test("percentile(z1, (50))", np.percentile(z1, 50))
# assert ne.test("percentile(z1, (50, 60))", np.percentile(z1, (50, 60)))
# assert ne.test("percentile(z1, (50, 60, 70))", np.percentile(z1, (50, 60, 70)))
# assert ne.test("percentile(z1, (50, 60, 70)) + percentile(z1, (50, 60, 70))",
# np.percentile(z1, (50, 60, 70)) + np.percentile(z1, (50, 60, 70)))
assert ne.test("percentile(z1, (50, 60))", np.percentile(z1, (50, 60)))
assert ne.test("percentile(z1, (50, 60, 70))", np.percentile(z1, (50, 60, 70)))
assert ne.test("percentile(z1, (50, 60, 70)) + percentile(z1, (50, 60, 70))",
np.percentile(z1, (50, 60, 70)) + np.percentile(z1, (50, 60, 70)))
assert ne.test("1 + var(z1, 0, 0+1, 2) + 1", 1+xr.DataArray.var(z1, axis=(0, 0+1, 2))+1)

assert ne.test("z1{mask1}", xr.DataArray.where(z1, mask1))
Expand Down

0 comments on commit bef2d2c

Please sign in to comment.