pyogrio 0.7.1__cp38-cp38-macosx_10_9_x86_64.whl → 0.7.2__cp38-cp38-macosx_10_9_x86_64.whl

pyogrio/_compat.py

@@ -28,6 +28,7 @@ HAS_ARROW_API = __gdal_version__ >= (3, 6, 0) and pyarrow is not None
 
 HAS_GEOPANDAS = geopandas is not None
 
+PANDAS_GE_15 = pandas is not None and Version(pandas.__version__) >= Version("1.5.0")
 PANDAS_GE_20 = pandas is not None and Version(pandas.__version__) >= Version("2.0.0")
 
 HAS_GDAL_GEOS = __gdal_geos_version__ is not None

pyogrio/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-10-26T15:56:41-0700",
+ "date": "2023-10-30T11:39:03-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "97d9dee48584208ccbb479b87d58ec1eb92b3f9c",
- "version": "0.7.1"
+ "full-revisionid": "71acde57ef674c8622d17b29663ff4349b1fee6e",
+ "version": "0.7.2"
 }
 '''  # END VERSION_JSON
 

pyogrio/geopandas.py

@@ -2,7 +2,7 @@ import os
 
 import numpy as np
 
-from pyogrio._compat import HAS_GEOPANDAS, PANDAS_GE_20
+from pyogrio._compat import HAS_GEOPANDAS, PANDAS_GE_15, PANDAS_GE_20
 from pyogrio.raw import (
     DRIVERS_NO_MIXED_SINGLE_MULTI,
     DRIVERS_NO_MIXED_DIMENSIONS,
@@ -275,7 +275,11 @@ def read_dataframe(
             # Index not asked, no geometry column and no attribute columns: return empty
             return pd.DataFrame()
         elif geometry_name in df.columns:
-            df["geometry"] = from_wkb(df.pop(geometry_name), crs=meta["crs"])
+            wkb_values = df.pop(geometry_name)
+            if PANDAS_GE_15 and wkb_values.dtype != object:
+                # for example ArrowDtype will otherwise create numpy array with pd.NA
+                wkb_values = wkb_values.to_numpy(na_value=None)
+            df["geometry"] = from_wkb(wkb_values, crs=meta["crs"])
             if force_2d:
                 df["geometry"] = shapely.force_2d(df["geometry"])
             return gp.GeoDataFrame(df, geometry="geometry")

pyogrio/tests/test_geopandas_io.py

@@ -17,6 +17,7 @@ from pyogrio.tests.conftest import (
     requires_arrow_api,
     requires_gdal_geos,
 )
+from pyogrio._compat import PANDAS_GE_15
 
 try:
     import pandas as pd
@@ -1442,3 +1443,26 @@ def test_metadata_unsupported(tmpdir, naturalearth_lowres, metadata_type):
     metadata_key = "layer_metadata" if metadata_type == "metadata" else metadata_type
 
     assert read_info(filename)[metadata_key] is None
+
+
+@pytest.mark.skipif(not PANDAS_GE_15, reason="ArrowDtype requires pandas 1.5+")
+def test_read_dataframe_arrow_dtypes(tmp_path):
+    # https://github.com/geopandas/pyogrio/issues/319 - ensure arrow binary
+    # column can be converted with from_wkb in case of missing values
+    pytest.importorskip("pyarrow")
+    filename = tmp_path / "test.gpkg"
+    df = gp.GeoDataFrame(
+        {"col": [1.0, 2.0]}, geometry=[Point(1, 1), None], crs="EPSG:4326"
+    )
+    write_dataframe(df, filename)
+
+    result = read_dataframe(
+        filename,
+        use_arrow=True,
+        arrow_to_pandas_kwargs={
+            "types_mapper": lambda pa_dtype: pd.ArrowDtype(pa_dtype)
+        },
+    )
+    assert isinstance(result["col"].dtype, pd.ArrowDtype)
+    result["col"] = result["col"].astype("float64")
+    assert_geodataframe_equal(result, df)

pyogrio/util.py

@@ -2,6 +2,8 @@ import re
 import sys
 from urllib.parse import urlparse
 
+from packaging.version import Version
+
 from pyogrio._env import GDALEnv
 
 with GDALEnv():
@@ -187,7 +189,7 @@ def _mask_to_wkb(mask):
     try:
         import shapely
 
-        if int(shapely.__version__.split(".")[0]) < 2:
+        if Version(shapely.__version__) < Version("2.0.0"):
             shapely = None
     except ImportError:
         shapely = None

{pyogrio-0.7.1.dist-info → pyogrio-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyogrio
-Version: 0.7.1
+Version: 0.7.2
 Summary: Vectorized spatial vector file format I/O using GDAL/OGR
 Home-page: https://github.com/geopandas/pyogrio
 Author: Brendan C. Ward
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi
 Requires-Dist: numpy
+Requires-Dist: packaging
 Provides-Extra: benchmark
 Requires-Dist: pytest-benchmark ; extra == 'benchmark'
 Provides-Extra: dev

{pyogrio-0.7.1.dist-info → pyogrio-0.7.2.dist-info}/RECORD

@@ -1,23 +1,28 @@
+pyogrio-0.7.2.dist-info/RECORD,,
+pyogrio-0.7.2.dist-info/LICENSE,sha256=e3KtZsP5KtU41F_46jNd4Gfba2PwF2bfVumh9KT6o7Y,1102
+pyogrio-0.7.2.dist-info/WHEEL,sha256=7bITxp1IXfScHG_aHqjgl3cb1WeEQowtBiPLTHk6_e8,109
+pyogrio-0.7.2.dist-info/top_level.txt,sha256=DUBAVaLxa9r0nHHskG8tHdP1P3zt6TYYPRiDBlEUc7Y,8
+pyogrio-0.7.2.dist-info/METADATA,sha256=tOnuXcTFeJDZHBwwFXfmNf1_4ipIl9n1aUnIVhscTSw,3807
 pyogrio/_err.pyx,sha256=qNlAfC3Qr006zKw3ZyRCM4DCiYHzf-AwJdCIT38lL1k,5977
-pyogrio/_err.cpython-38-darwin.so,sha256=Ubl5YIFn3kvHoN4Pi1ztwJkk1JH_oQX_wcxm4d4Yk3Y,153584
-pyogrio/_version.py,sha256=g5l2j1Q39eUO6VNS1n-hwIzMgrb9CmuiVm-CB3GVY_4,497
+pyogrio/_err.cpython-38-darwin.so,sha256=qipengCkmsssu1GTED8O-NrducwkvO9ugPd-DrbnTkI,153584
+pyogrio/_version.py,sha256=B-MKvOdxOlxitQZYhOYjmSv7Xo6dIy1o3TCMiBRuSac,497
 pyogrio/raw.py,sha256=xE-Zku_KG1t28-Oo8q2XVS32wChWURq9rmj3uMLnI-s,18559
 pyogrio/_ogr.pxd,sha256=nVi4I9gP7gQGkskP4TMK2utSr2DAKCIKT6ep0Tqta54,15296
-pyogrio/util.py,sha256=F4jm32jEj7RtMv18yfFfobkqjEFRkeJ3uMDbNJ6vUCw,4889
+pyogrio/util.py,sha256=WanURqX9cYpvUF6RPnZtzzz-SwHTsWtmBHUXAU0Wn0w,4933
 pyogrio/_io.pxd,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyogrio/_geometry.pxd,sha256=glEFGgam8GVAnJr8q9NQ4zLdFYjIRd9Hn7LoNP8MOt8,147
 pyogrio/__init__.py,sha256=MMMoDLcxEXX_6772HCwqGExFCz1bTm4wC_IZ7blUMs8,1026
 pyogrio/core.py,sha256=YBi8EYBHb7WuAO8hFknmvYrQzS0kX65ADzPscu_KxjI,10680
-pyogrio/_ogr.cpython-38-darwin.so,sha256=OjIDBHfSXDCCpDwvpZVZ0WrzI3JpuI8-EBO9JDAnlEI,181840
-pyogrio/geopandas.py,sha256=E0FF3HnODR8v8ltao-BE5oymAYq7kt8q5MlMXJk4Fmg,23586
+pyogrio/_ogr.cpython-38-darwin.so,sha256=j7-_cgbXyFHdKzaIVWijv6nau3xRZi2QoEmZeEaumWU,181840
+pyogrio/geopandas.py,sha256=MDMcyW9PLYGW_QMmXrJbJjjr6nQYLeYIa75uqyp1MDk,23846
 pyogrio/arrow_bridge.h,sha256=cmDLGfuENF3dE1MwByyfkZ9Yey5RsHo2Xg_vYujlWew,3573
 pyogrio/_geometry.pyx,sha256=z4RJdJyMZvFShX3B2dBErMglQFDWUkUqqlOFTaEOBRg,4071
 pyogrio/_io.pyx,sha256=ba1V9VKy0Nzb5xRTeMe32WKo1mDAneUCkiJkn76Nyeo,67023
 pyogrio/_ogr.pyx,sha256=-WlLmRItqz7BMh977ZjKwXL76RJEI6nPT9IvYmKPGts,10295
 pyogrio/errors.py,sha256=otUCS22V7jd-4b5o49YLTqmHzzHlr3XrEIyoF2qDSOA,666
-pyogrio/_geometry.cpython-38-darwin.so,sha256=6L4cXmd-vMo64msfjjuS5c88fLj54rEqWJjpjfkRM1g,107952
-pyogrio/_compat.py,sha256=33sX3KTkoeaq4RTTrLW1hsQwXnqN9DsQbeQassLNUYU,730
-pyogrio/_io.cpython-38-darwin.so,sha256=jroz4zjQ-CxcUPuoIhSWFm1Vt9amS4L7ezmUPRHaHHU,633024
+pyogrio/_geometry.cpython-38-darwin.so,sha256=aPo8FLYyX12e7xyZSOf64crgZMXRN5_WDNgIa9f4Ldo,107952
+pyogrio/_compat.py,sha256=XXUcKt-_oTVDteHzLFGovDdSwMe_cB_m9nmYzItxFVk,816
+pyogrio/_io.cpython-38-darwin.so,sha256=uHa4Mes2g5f7Ip5d-33XMfmS_xkRkEdrX-vRWjqZp2A,633024
 pyogrio/_env.py,sha256=jf-nUbLqQka-XGKijLh4Oh0Lur_uj7XyvQVSQ0jXZ_0,1531
 pyogrio/_err.pxd,sha256=DKe5pdq8CqnaW3U_w9X56iBqdylIvOaRk-sExSXA3WU,166
 pyogrio/proj_data/vcpkg.spdx.json,sha256=CrnyrnrR5HISU0DOU4CcyDzGsd0qRgqXCagteuH_5ok,7311
@@ -50,7 +55,7 @@ pyogrio/tests/test_raw_io.py,sha256=qa7R-PnVLRDQMHDhj2d4dDFmYQIiTuBqH4OJdATS5SU,
 pyogrio/tests/test_core.py,sha256=v1DLWiNmPXZtKygMcpRFoKuzVqxdrMc11AtAt9Ud404,16168
 pyogrio/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyogrio/tests/win32.py,sha256=mEV4Aeb7Xm-8l49G-U-x9xHMjbzJRVhxqgK-EwD5jYE,2098
-pyogrio/tests/test_geopandas_io.py,sha256=3QPqAQjA7MPhw7aQYlA63cWPYJrFBnIS3DXU2RO1XOc,50031
+pyogrio/tests/test_geopandas_io.py,sha256=zvDtPkSdRTXV6kMnnf6T9inZQeJ7fkmCELwrpMUXRUA,50905
 pyogrio/tests/test_path.py,sha256=Je2OKjnmosRDpXwl07JPd_mpvRuwRRuEdEB1Z-o7_qo,10784
 pyogrio/tests/test_arrow.py,sha256=lFEvDeAH7EoTYMzzQ6t7vwHL8C1fcs3nF4g9GhvOve4,6947
 pyogrio/tests/fixtures/test_multisurface.gpkg,sha256=sc6yaD6RxjqCGIT0ijBXgxEWYNMZNPLOetKvD5njGYY,98304
@@ -229,8 +234,3 @@ pyogrio/gdal_data/jpfgdgml_SBBdry.gfs,sha256=JDySSKChX3q0KetcBBC62Bvsr59qj8aq7_L
 pyogrio/gdal_data/netcdf_config.xsd,sha256=O1eIEmlSx3y7N1hIMtfb5GzD_F7hunQdlKI1pXpi3v4,7491
 pyogrio/gdal_data/vdv452.xml,sha256=q1KF0BR-dDEIomwkRLhTksR4f_maMumayx4hQ2wju8k,25816
 pyogrio/gdal_data/ecw_cs.wkt,sha256=1DGJPrRGsmXSBu6ohj3NzOO2XHwqcH2qtY6J5YOvAz4,364032
-pyogrio-0.7.1.dist-info/RECORD,,
-pyogrio-0.7.1.dist-info/LICENSE,sha256=e3KtZsP5KtU41F_46jNd4Gfba2PwF2bfVumh9KT6o7Y,1102
-pyogrio-0.7.1.dist-info/WHEEL,sha256=9eQSRGrOa03o6gOAokAH2Pxmxf46-vNjolslVVBruVM,109
-pyogrio-0.7.1.dist-info/top_level.txt,sha256=DUBAVaLxa9r0nHHskG8tHdP1P3zt6TYYPRiDBlEUc7Y,8
-pyogrio-0.7.1.dist-info/METADATA,sha256=Im1FpA1WrH6FUUMN7lsO2lAgo3VpSV78jwVKWsLw-5o,3782

{pyogrio-0.7.1.dist-info → pyogrio-0.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_10_9_x86_64