pyogrio 0.7.1__cp310-cp310-win_amd64.whl → 0.7.2__cp310-cp310-win_amd64.whl

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.2.dist-info/DELVEWHEEL

@@ -0,0 +1,2 @@
+Version: 1.5.1
+Arguments: ['C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-4zvxj8ir\\cp310-win_amd64\\build\\venv\\Scripts\\delvewheel', 'repair', '--add-path', 'C:/vcpkg/installed/x64-windows-dynamic-release/bin', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-4zvxj8ir\\cp310-win_amd64\\repaired_wheel', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-4zvxj8ir\\cp310-win_amd64\\built_wheel\\pyogrio-0.7.2-cp310-cp310-win_amd64.whl']

{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,28 +1,28 @@
 pyogrio/arrow_bridge.h,sha256=EfWAiMO2rssy2SA5sMiApGWvmIFp_1YQA1Q3D9wCy6w,3688
 pyogrio/core.py,sha256=gqpACOruAauWqc5ziz8aWxU-oyvdUSfmT5yNutlX7rk,11001
 pyogrio/errors.py,sha256=EUpf5UaLuzB6mybXfZ21F-2AfC9GWPYTGjRST6AIPEM,698
-pyogrio/geopandas.py,sha256=ntJXY4mgytuAs0nMlJoxRgMKGuP_FhXz1ec0M6DbqMM,24151
+pyogrio/geopandas.py,sha256=pzHrzZAIToRCbQhMvoS6Tcn5beBUMJF8PJ20EtF597Y,24415
 pyogrio/raw.py,sha256=c0hcxxLNjdl1LCV-9OcmGCaLm06-8J3RyOZV8XS_U-g,19108
-pyogrio/util.py,sha256=kQN8-iF5-Xb-4cyz1a7ePVR0USiTEoQZ2H2e8P2Wk1k,5090
-pyogrio/_compat.py,sha256=ZiXEYUrSQoYfzjUJxriH64-PpqVMN6dKLQkKQ_95xJU,765
+pyogrio/util.py,sha256=ajIYzeZSNmwLk_auwIZGq2zbhgBUh4cn6xythhRWiuY,5136
+pyogrio/_compat.py,sha256=mRTmqgoAa3FwqZnnrqVslPD_quMwC3d3K-xOr5bhiy4,852
 pyogrio/_env.py,sha256=Sl9xkpcMi-b2jxR0L8rMFKW15eESFb1HBEIxzQvXX_E,1592
 pyogrio/_err.c,sha256=5sEthM6DG7Ge1QKNkbVsGUWu-EsehRh8ISVUa7IAAOk,433292
-pyogrio/_err.cp310-win_amd64.pyd,sha256=tzKp-aWk_y2UTQQL6G46-DuuzWt3P397lCU0A-S_ghs,74752
+pyogrio/_err.cp310-win_amd64.pyd,sha256=lQaXwA5zTALHI_kIzGVSZ3wsR5ZvfcomA3povwQTP28,74752
 pyogrio/_err.pxd,sha256=Qxp418g6T9MPmpUZJR9rhr31NZwI4pu-9hFH7aaj59w,170
 pyogrio/_err.pyx,sha256=1ftE4lFtf2ouigZz-RJHjyYZaq3akpcjvxH9I10VsLo,6223
 pyogrio/_geometry.c,sha256=tDmK6Hitw6kgZDFwisjTkX3WR3Yk32ZMygHW3CpUBSs,331842
-pyogrio/_geometry.cp310-win_amd64.pyd,sha256=UKN4gaqE8BBT2xxd7jeoXBVM18pjuXgXTqk7gFXbpJI,51712
+pyogrio/_geometry.cp310-win_amd64.pyd,sha256=3R8MRUbNasvyueez2KcyHUR8ExGIooZAc5dp2WaMDx0,51712
 pyogrio/_geometry.pxd,sha256=mm6aPgDYvlDI79K0leMtDBGTqaRdlBH8pzg2v2zRqvs,150
 pyogrio/_geometry.pyx,sha256=l42NiTzO5INk8pOO8xDCpHdxfO8XO9WicRo5CIzh08I,4199
-pyogrio/_io.c,sha256=k7oXes5n7i2fC79_7FOMum9_6DzuKwt2gvtoq6S3VhI,2472969
-pyogrio/_io.cp310-win_amd64.pyd,sha256=Xg7vf_F-5fUj81Unr9OnxxeD6WqHyNLuvr83_jtR8bI,394752
+pyogrio/_io.c,sha256=43lCNElSPku-zccKyj11VvtV7yO49Vks2p9NHgYw9EY,2472969
+pyogrio/_io.cp310-win_amd64.pyd,sha256=ucLr19f8hCXni0evQDhGqJ9ZT3Y6FRMEK8skLAZ0wxM,394752
 pyogrio/_io.pxd,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyogrio/_io.pyx,sha256=wP8XrEoxuEohJRRKQpKixt41VZhSkognsRsD0KGMwPA,69102
 pyogrio/_ogr.c,sha256=PrIY1s5DyckvC247UVk-wRLOr5Gwin1UCxjrjRyOI2E,599636
-pyogrio/_ogr.cp310-win_amd64.pyd,sha256=hGrFWrm3sOzMIOSx9ru_xZ7SqC-4ZQGUrWF4rirRbHY,101376
+pyogrio/_ogr.cp310-win_amd64.pyd,sha256=FIw0Xpw-bJH1Sp6NS8jRh7dpmFm_vRRoooAy5voNVis,101376
 pyogrio/_ogr.pxd,sha256=OxXpjW4hXt8n50jP_yiGNoDt1y04aa8LOtE6ZFhTwQY,15683
 pyogrio/_ogr.pyx,sha256=rUuTMK_PZxDlNKdM500EqVc5QbtCFUx3Oq8U5_B-_U4,10657
-pyogrio/_version.py,sha256=XFuN9W_1W9PWV3ID5zKxS62Er7U12RhXmxUuyy8-zdE,518
+pyogrio/_version.py,sha256=ul2yqzdHOdtcjK_i0mWwPtAeeeHfKcYJ2F1Z1aAlcRk,518
 pyogrio/__init__.py,sha256=YeAeVQ7wSaBWuzLGWxXFzUFODGFQXEGDjEghdiFO42k,1409
 pyogrio/gdal_data/bag_template.xml,sha256=2veBb2hsNbUexmyQ_GrtvxLb75fyj5-ulzE5L5KvtzM,9020
 pyogrio/gdal_data/copyright,sha256=Ha40aOgdANpW4pNvdNM7izrQnXJkN_Gc4gml2r6kH3c,21841
@@ -213,7 +213,7 @@ pyogrio/proj_data/world,sha256=8nHNPlbHdZ0vz7u9OYcCZOuBBkFVcTwE_JLq3TCt60g,7079
 pyogrio/tests/conftest.py,sha256=XH91Uo-XDhiIj5TO92yPBLxqB4CtgyDdrh-jjN2d-Pc,3945
 pyogrio/tests/test_arrow.py,sha256=jDeD3EnXc3lA-jTLaQ18xc55Z23eb8qNpiheehbm4lE,7154
 pyogrio/tests/test_core.py,sha256=4-AjVV6-Jmx4NGAsDtdmx9yQLVTy2spPbJoEl78ingM,16664
-pyogrio/tests/test_geopandas_io.py,sha256=PHY-KLgK770me7QSubf8AJjNiLNcvTLFpv64zN6dhkQ,51475
+pyogrio/tests/test_geopandas_io.py,sha256=R7ZtGbw5lxVXLMixMeXiO8V0OFpWrwenXEYO_X4Eb-g,52373
 pyogrio/tests/test_path.py,sha256=LXAx98tnkQaUFtzCs62AjksPGstHlr69Xugq2A7BiGQ,11116
 pyogrio/tests/test_raw_io.py,sha256=LIqk5gR-U62P7oox3xEOkYdZeGN0WC56CTtmEH66of8,40461
 pyogrio/tests/win32.py,sha256=d_lpa-anO_TvND2hXOucuhFmrGJf07NN3eEZxvroqKA,2184
@@ -232,12 +232,12 @@ pyogrio/tests/fixtures/naturalearth_lowres/naturalearth_lowres.dbf,sha256=0q4cma
 pyogrio/tests/fixtures/naturalearth_lowres/naturalearth_lowres.prj,sha256=mKrz0cDsrfGkJKRTbeJhw9r043NpfLhsQMQ7mJ2vUus,143
 pyogrio/tests/fixtures/naturalearth_lowres/naturalearth_lowres.shp,sha256=CONBYG6DkeRYw_CN6zEt5mS1a_rjdgZMWqCu5mgaX1U,180924
 pyogrio/tests/fixtures/naturalearth_lowres/naturalearth_lowres.shx,sha256=iwvirZfdSEruXC68mGl9U3LoMriuWKNaZhru9rmFZo0,1516
-pyogrio-0.7.1.dist-info/DELVEWHEEL,sha256=ANKHPGOFhIdKeiO939EalakHMYTv8yvAfkpZO7Ewt9U,467
-pyogrio-0.7.1.dist-info/LICENSE,sha256=Ct2aqKxglcGNtFadzH5GIuZMeCMkr_mE8_YzJ_b4O80,1123
-pyogrio-0.7.1.dist-info/METADATA,sha256=CZdC_wjV3iu13tvTny4c8aLX58abadHVRfdAupFP4Fo,3881
-pyogrio-0.7.1.dist-info/RECORD,,
-pyogrio-0.7.1.dist-info/top_level.txt,sha256=DUBAVaLxa9r0nHHskG8tHdP1P3zt6TYYPRiDBlEUc7Y,8
-pyogrio-0.7.1.dist-info/WHEEL,sha256=yrvteVAZzxQvtDnzdCRh4dP01sPIxYhLXIXplC7o50E,102
+pyogrio-0.7.2.dist-info/DELVEWHEEL,sha256=7_-krOWROSgu6c0CGDfrjUSm5WnykIfVF76lC1yk8as,467
+pyogrio-0.7.2.dist-info/LICENSE,sha256=Ct2aqKxglcGNtFadzH5GIuZMeCMkr_mE8_YzJ_b4O80,1123
+pyogrio-0.7.2.dist-info/METADATA,sha256=3ChIITUDVFNm9dZFRZ3bKh1J1-nR41XQCVnxjiQ_HCI,3907
+pyogrio-0.7.2.dist-info/RECORD,,
+pyogrio-0.7.2.dist-info/top_level.txt,sha256=DUBAVaLxa9r0nHHskG8tHdP1P3zt6TYYPRiDBlEUc7Y,8
+pyogrio-0.7.2.dist-info/WHEEL,sha256=QZRFZfINHXboTe9fmBqbFIViCGEqzQrgdxTyahla7mM,102
 pyogrio.libs/gdal-c3b1d8f66682071d0cd26d86e4182013.dll,sha256=yyy7HZx4CF_buMo5x3iNkyiqN0E2Dnm9VGByCzlQZPU,16030208
 pyogrio.libs/geos-1c764a1384537a0ad2995e83d23e8642.dll,sha256=572O9nmVHQx0YQVZyIQxc1UsM2kFx1t0xjVALYqCWWU,1993216
 pyogrio.libs/geos_c-0d7dfdcee49efa8df585e2fb993157aa.dll,sha256=SkTaKYkMSaNxzb0NF92Lb6e7TI-a9iI9Z8hwsEqd4Xs,381952

{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: cp310-cp310-win_amd64
 

pyogrio-0.7.1.dist-info/DELVEWHEEL

@@ -1,2 +0,0 @@
-Version: 1.5.1
-Arguments: ['C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-_qnuvglh\\cp310-win_amd64\\build\\venv\\Scripts\\delvewheel', 'repair', '--add-path', 'C:/vcpkg/installed/x64-windows-dynamic-release/bin', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-_qnuvglh\\cp310-win_amd64\\repaired_wheel', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-_qnuvglh\\cp310-win_amd64\\built_wheel\\pyogrio-0.7.1-cp310-cp310-win_amd64.whl']