Skip to content

Commit

Permalink
fix: xfail some parquet tests due to item -> element change in pyar…
Browse files Browse the repository at this point in the history
…row 13 (#352)
  • Loading branch information
douglasdavis authored Aug 25, 2023
1 parent aa95761 commit abe7f45
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
11 changes: 8 additions & 3 deletions src/dask_awkward/lib/testutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import awkward as ak
import numpy as np
import pyarrow as pa
from dask.base import is_dask_collection
from packaging.version import Version

Expand All @@ -17,9 +18,13 @@
DEFAULT_SCHEDULER: Any = "sync"


NP_LTE_1_25_0 = Version(np.__version__) >= Version("1.25.0")
AK_GTE_2_2_3 = Version(ak.__version__) <= Version("2.2.3")
BAD_NP_AK_MIXIN_VERSIONING = NP_LTE_1_25_0 and AK_GTE_2_2_3
NP_GTE_1_25_0 = Version(np.__version__) >= Version("1.25.0")
AK_LTE_2_2_3 = Version(ak.__version__) <= Version("2.2.3")
BAD_NP_AK_MIXIN_VERSIONING = NP_GTE_1_25_0 and AK_LTE_2_2_3

AK_LTE_2_3_3 = Version(ak.__version__) <= Version("2.3.3")
PA_GTE_3_0_0 = Version(pa.__version__) >= Version("13.0.0")
BAD_PA_AK_PARQUET_VERSIONING = AK_LTE_2_3_3 and PA_GTE_3_0_0


def assert_eq(
Expand Down
7 changes: 6 additions & 1 deletion tests/test_parquet.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import dask_awkward as dak
from dask_awkward.lib.io.parquet import _metadata_file_from_data_files, to_parquet
from dask_awkward.lib.testutils import assert_eq
from dask_awkward.lib.testutils import BAD_PA_AK_PARQUET_VERSIONING, assert_eq

data = [[1, 2, 3], [4, None], None]
arr = pa.array(data)
Expand Down Expand Up @@ -74,6 +74,7 @@ def test_remote_double(ignore_metadata, scan_files, split_row_groups):
)


@pytest.mark.xfail(BAD_PA_AK_PARQUET_VERSIONING, reason="parquet item vs element")
@pytest.mark.parametrize("ignore_metadata", [True, False])
@pytest.mark.parametrize("scan_files", [True, False])
def test_dir_of_one_file(tmpdir, ignore_metadata, scan_files):
Expand All @@ -84,6 +85,7 @@ def test_dir_of_one_file(tmpdir, ignore_metadata, scan_files):
assert arr["arr"].compute().to_list() == data


@pytest.mark.xfail(BAD_PA_AK_PARQUET_VERSIONING, reason="parquet item vs element")
@pytest.mark.parametrize("ignore_metadata", [True, False])
@pytest.mark.parametrize("scan_files", [True, False])
def test_dir_of_one_file_metadata(tmpdir, ignore_metadata, scan_files):
Expand All @@ -98,6 +100,7 @@ def test_dir_of_one_file_metadata(tmpdir, ignore_metadata, scan_files):
assert arr["arr"].compute().to_list() == data


@pytest.mark.xfail(BAD_PA_AK_PARQUET_VERSIONING, reason="parquet item vs element")
@pytest.mark.parametrize("ignore_metadata", [True, False])
@pytest.mark.parametrize("scan_files", [True, False])
def test_dir_of_two_files(tmpdir, ignore_metadata, scan_files):
Expand All @@ -111,6 +114,7 @@ def test_dir_of_two_files(tmpdir, ignore_metadata, scan_files):
assert arr["arr"].compute().to_list() == data * 2


@pytest.mark.xfail(BAD_PA_AK_PARQUET_VERSIONING, reason="parquet item vs element")
@pytest.mark.parametrize("ignore_metadata", [True, False])
@pytest.mark.parametrize("scan_files", [True, False])
def test_dir_of_two_files_metadata(tmpdir, ignore_metadata, scan_files):
Expand All @@ -126,6 +130,7 @@ def test_dir_of_two_files_metadata(tmpdir, ignore_metadata, scan_files):
assert arr["arr"].compute().to_list() == data * 2


@pytest.mark.xfail(BAD_PA_AK_PARQUET_VERSIONING, reason="parquet item vs element")
def test_columns(tmpdir):
tmpdir = str(tmpdir)
pad.write_dataset(ds_deep, tmpdir, format="parquet")
Expand Down

0 comments on commit abe7f45

Please sign in to comment.