Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TST: enable csv tests for use_arrow #490

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

TST: enable csv tests for use_arrow #490

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eee2e57
TST: enable csv tests for use_arrow
theroggy Oct 20, 2024
4165e6a
Only for utf-8
theroggy Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions pyogrio/tests/test_geopandas_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,20 @@ def spatialite_available(path):
return False


@pytest.mark.parametrize("encoding", ["utf-8", "cp1252", None])
def test_read_csv_encoding(tmp_path, encoding):
@pytest.mark.parametrize(
"encoding, arrow",
[
("utf-8", False),
pytest.param("utf-8", True, marks=requires_pyarrow_api),
("cp1252", False),
(None, False),
],
)
def test_read_csv_encoding(tmp_path, encoding, arrow):
""" "Test reading CSV files with different encodings.

Arrow only supports utf-8 encoding.
"""
# Write csv test file. Depending on the os this will be written in a different
# encoding: for linux and macos this is utf-8, for windows it is cp1252.
csv_path = tmp_path / "test.csv"
Expand All @@ -105,7 +117,7 @@ def test_read_csv_encoding(tmp_path, encoding):
# Read csv. The data should be read with the same default encoding as the csv file
# was written in, but should have been converted to utf-8 in the dataframe returned.
# Hence, the asserts below, with strings in utf-8, be OK.
df = read_dataframe(csv_path, encoding=encoding)
df = read_dataframe(csv_path, encoding=encoding, use_arrow=arrow)

assert len(df) == 1
assert df.columns.tolist() == ["näme", "city"]
Expand All @@ -117,14 +129,14 @@ def test_read_csv_encoding(tmp_path, encoding):
locale.getpreferredencoding().upper() == "UTF-8",
reason="test requires non-UTF-8 default platform",
)
def test_read_csv_platform_encoding(tmp_path):
def test_read_csv_platform_encoding(tmp_path, use_arrow):
"""verify that read defaults to platform encoding; only works on Windows (CP1252)"""
csv_path = tmp_path / "test.csv"
with open(csv_path, "w", encoding=locale.getpreferredencoding()) as csv:
csv.write("näme,city\n")
csv.write("Wilhelm Röntgen,Zürich\n")

df = read_dataframe(csv_path)
df = read_dataframe(csv_path, use_arrow=use_arrow)

assert len(df) == 1
assert df.columns.tolist() == ["näme", "city"]
Expand Down Expand Up @@ -943,9 +955,20 @@ def test_read_sql_dialect_sqlite_gpkg(naturalearth_lowres, use_arrow):
assert df.iloc[0].geometry.area > area_canada


@pytest.mark.parametrize("encoding", ["utf-8", "cp1252", None])
def test_write_csv_encoding(tmp_path, encoding):
"""Test if write_dataframe uses the default encoding correctly."""
@pytest.mark.parametrize(
"encoding, arrow",
[
("utf-8", False),
pytest.param("utf-8", True, marks=requires_arrow_write_api),
("cp1252", False),
(None, False),
],
)
def test_write_csv_encoding(tmp_path, encoding, arrow):
"""Test if write_dataframe uses the default encoding correctly.

Arrow only supports utf-8 encoding.
"""
# Write csv test file. Depending on the os this will be written in a different
# encoding: for linux and macos this is utf-8, for windows it is cp1252.
csv_path = tmp_path / "test.csv"
Expand All @@ -958,7 +981,7 @@ def test_write_csv_encoding(tmp_path, encoding):
# same encoding as above.
df = pd.DataFrame({"näme": ["Wilhelm Röntgen"], "city": ["Zürich"]})
csv_pyogrio_path = tmp_path / "test_pyogrio.csv"
write_dataframe(df, csv_pyogrio_path, encoding=encoding)
write_dataframe(df, csv_pyogrio_path, encoding=encoding, use_arrow=arrow)

# Check if the text files written both ways can be read again and give same result.
with open(csv_path, encoding=encoding) as csv:
Expand Down
Loading