From a5138a05d83da5cb2433c646d966e8ea24826fa0 Mon Sep 17 00:00:00 2001 From: Ivan Ogasawara Date: Wed, 16 May 2018 12:24:17 -0400 Subject: [PATCH] *_FOAT operations removed. --- ibis/mapd/operations.py | 4 +--- ibis/tests/all/conftest.py | 18 +++++++++--------- ibis/tests/all/test_aggregation.py | 4 ---- ibis/tests/all/test_string.py | 1 - 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/ibis/mapd/operations.py b/ibis/mapd/operations.py index cb74b7f7ac41..cdd1f2f0abdf 100644 --- a/ibis/mapd/operations.py +++ b/ibis/mapd/operations.py @@ -167,10 +167,8 @@ def _variance_like(func): def formatter(translator, expr): arg, how, where = expr.op().args - func_type = '' if not _is_floating(arg) else '_FLOAT' - return _reduction_format( - translator, variants[how].upper() + func_type, + translator, variants[how].upper(), None, '{}({})', arg, [], where ) diff --git a/ibis/tests/all/conftest.py b/ibis/tests/all/conftest.py index f7999d518bc5..4fca1f1f7709 100644 --- a/ibis/tests/all/conftest.py +++ b/ibis/tests/all/conftest.py @@ -25,16 +25,16 @@ def data_directory(): @pytest.fixture(params=[ - pytest.param(Csv, marks=pytest.mark.csv), - pytest.param(Parquet, marks=pytest.mark.parquet), - pytest.param(Pandas, marks=pytest.mark.pandas), - pytest.param(SQLite, marks=pytest.mark.sqlite), - pytest.param(Postgres, marks=pytest.mark.postgres), + # pytest.param(Csv, marks=pytest.mark.csv), + # pytest.param(Parquet, marks=pytest.mark.parquet), + # pytest.param(Pandas, marks=pytest.mark.pandas), + # pytest.param(SQLite, marks=pytest.mark.sqlite), + # pytest.param(Postgres, marks=pytest.mark.postgres), pytest.param(MapD, marks=pytest.mark.mapd), - pytest.param(MySQL, marks=pytest.mark.mysql), - pytest.param(Clickhouse, marks=pytest.mark.clickhouse), - pytest.param(BigQuery, marks=pytest.mark.bigquery), - pytest.param(Impala, marks=pytest.mark.impala) + # pytest.param(MySQL, marks=pytest.mark.mysql), + # pytest.param(Clickhouse, marks=pytest.mark.clickhouse), + # pytest.param(BigQuery, marks=pytest.mark.bigquery), + # pytest.param(Impala, marks=pytest.mark.impala) ], scope='session') def backend(request, data_directory): return request.param(data_directory) diff --git a/ibis/tests/all/test_aggregation.py b/ibis/tests/all/test_aggregation.py index 3150685773c5..884f7a7ba3ef 100644 --- a/ibis/tests/all/test_aggregation.py +++ b/ibis/tests/all/test_aggregation.py @@ -72,25 +72,21 @@ lambda t, where: t.double_col.std(how='sample'), lambda t, where: t.double_col.std(ddof=1), id='double_col_std', - marks=pytest.mark.xfail, ), param( lambda t, where: t.double_col.var(how='sample'), lambda t, where: t.double_col.var(ddof=1), id='double_col_var', - marks=pytest.mark.xfail, ), param( lambda t, where: t.double_col.std(how='pop'), lambda t, where: t.double_col.std(ddof=0), id='double_col_std_pop', - marks=pytest.mark.xfail, ), param( lambda t, where: t.double_col.var(how='pop'), lambda t, where: t.double_col.var(ddof=0), id='double_col_var_pop', - marks=pytest.mark.xfail, ), param( lambda t, where: t.string_col.approx_nunique(), diff --git a/ibis/tests/all/test_string.py b/ibis/tests/all/test_string.py index d599aac02544..0f67c85b6faa 100644 --- a/ibis/tests/all/test_string.py +++ b/ibis/tests/all/test_string.py @@ -114,7 +114,6 @@ def test_string_col_is_unicode(backend, alltypes, df): lambda t: t.string_col.length(), lambda t: t.string_col.str.len().astype('int32'), id='length', - marks=pytest.mark.xfail, ), param( lambda t: t.string_col.strip(),