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

Raise error if function is used with parameters to read no geometry, columns, or fids #280

Merged
merged 11 commits into from
Sep 6, 2023
+150 −33
Merged

Raise error if function is used with parameters to read no geometry, columns, or fids #280

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eea54f3
Raise error if no geometry nor any columns asked to be read
theroggy Sep 3, 2023
17ef0d0
Extra tests, clearer message
theroggy Sep 3, 2023
8280b10
Remove redundant arrow tests
theroggy Sep 3, 2023
108ee20
Update CHANGES.md
theroggy Sep 3, 2023
88c7a29
Update CHANGES.md
theroggy Sep 3, 2023
3d5ed64
Skip arrow tests if arrow not available
theroggy Sep 3, 2023
1b24861
Return empty dataframe if no columns and no fids asked
theroggy Sep 3, 2023
0daf503
Test was moved to test_geopandas_io
theroggy Sep 3, 2023
6175a73
Simplify expression to test if user asks to read nothing
theroggy Sep 5, 2023
2e99bc4
Update CHANGES.md
theroggy Sep 5, 2023
f1f6a82
Move skip to mark.parametrize
theroggy Sep 5, 2023
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
Prev Previous commit
Next Next commit
Test was moved to test_geopandas_io
@theroggy
theroggy committed Sep 3, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 0daf503f0e141616eb2fe7e38939f1bae02ad1e9
5 changes: 0 additions & 5 deletions pyogrio/tests/test_arrow.py
View file
Original file line number Diff line number Diff line change
@@ -47,11 +47,6 @@ def test_read_arrow_columns(naturalearth_lowres):
assert result.columns.tolist() == ["continent", "geometry"]


def test_read_arrow_layer_without_geometry(test_fgdb_vsi):
result = read_dataframe(test_fgdb_vsi, layer="basetable", use_arrow=True)
assert type(result) is pd.DataFrame


def test_read_arrow_ignore_geometry(naturalearth_lowres):
result = read_dataframe(naturalearth_lowres, use_arrow=True, read_geometry=False)
assert type(result) is pd.DataFrame