From bef2d2c648b6bf226fba1faecc205aa966eca27b Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Wed, 10 Aug 2016 11:40:10 +1000 Subject: [PATCH] test --- setup.py | 2 +- tests/analytics_execution_engine/test_ndexpr.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 648d86ac36..3c7fc806ba 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ 'toolz', 'xarray', 'scipy', - 'pyparsing==2.1.4', + 'pyparsing==2.1.5', 'matplotlib', 'numexpr', 'future', diff --git a/tests/analytics_execution_engine/test_ndexpr.py b/tests/analytics_execution_engine/test_ndexpr.py index f4cd6511a4..c25d62d6e9 100644 --- a/tests/analytics_execution_engine/test_ndexpr.py +++ b/tests/analytics_execution_engine/test_ndexpr.py @@ -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))