Skip to content

Commit 60d558e

Browse files
authored
Merge pull request OSGeo#13697 from rouault/parquet_conflict_with_geoarrow_pyarrow
Parquet: avoid conflicts with geoarrow.pyarrow Python module when …
2 parents 7b505ed + 5e11538 commit 60d558e

File tree

4 files changed

+222
-197
lines changed

4 files changed

+222
-197
lines changed

.github/workflows/cmake_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ jobs:
434434
cfitsio freexl geotiff libjpeg-turbo libpq libspatialite libwebp-base pcre pcre2 postgresql \
435435
sqlite tiledb zstd cryptopp cgal doxygen librttopo openssl liblzma-devel \
436436
openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc libarchive \
437-
libarrow pyarrow libaec libheif libavif muparser cmake fsspec
437+
libarrow pyarrow geoarrow-pyarrow libaec libheif libavif muparser cmake fsspec
438438
pip install -r doc/requirements.txt
439439
- name: Check CMake version
440440
shell: bash -l {0}
Binary file not shown.

autotest/ogr/ogr_parquet.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4275,6 +4275,22 @@ def test_ogr_parquet_writing_arrow_json_extension(tmp_vsimem):
42754275
assert f["extension_json"] == '{"foo":"bar"}'
42764276

42774277

4278+
###############################################################################
4279+
4280+
4281+
@pytest.mark.parametrize("check_with_geoarrow_pyarrow", [False, True])
4282+
@gdaltest.enable_exceptions()
4283+
def test_ogr_parquet_read_geoarrow_without_geoparquet(check_with_geoarrow_pyarrow):
4284+
4285+
if check_with_geoarrow_pyarrow:
4286+
pytest.importorskip("geoarrow.pyarrow")
4287+
4288+
ds = ogr.Open("data/parquet/poly_geoarrow_polygon_not_geoparquet.parquet")
4289+
lyr = ds.GetLayer(0)
4290+
assert lyr.GetGeometryColumn() == "geometry"
4291+
assert lyr.GetGeomType() == ogr.wkbPolygon
4292+
4293+
42784294
###############################################################################
42794295
# Test ignored fields with arrow::dataset and bounding box column
42804296

0 commit comments

Comments
 (0)