pyogrio 0.7.1__tar.gz → 0.7.2__tar.gz

{pyogrio-0.7.1/pyogrio.egg-info → pyogrio-0.7.2}/PKG-INFO

@@ -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: dev
 Requires-Dist: Cython; extra == "dev"
 Provides-Extra: test

{pyogrio-0.7.1 → pyogrio-0.7.2}/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-0.7.1 → pyogrio-0.7.2}/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-0.7.1 → pyogrio-0.7.2}/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-0.7.1 → pyogrio-0.7.2}/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-0.7.1 → pyogrio-0.7.2}/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 → pyogrio-0.7.2/pyogrio.egg-info}/PKG-INFO

@@ -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: dev
 Requires-Dist: Cython; extra == "dev"
 Provides-Extra: test

{pyogrio-0.7.1 → pyogrio-0.7.2}/pyogrio.egg-info/requires.txt

@@ -1,5 +1,6 @@
 certifi
 numpy
+packaging
 
 [benchmark]
 pytest-benchmark

{pyogrio-0.7.1 → pyogrio-0.7.2}/setup.py

@@ -227,7 +227,7 @@ setup(
     long_description_content_type="text/markdown",
     long_description=open("README.md").read(),
     python_requires=">=3.8",
-    install_requires=["certifi", "numpy"],
+    install_requires=["certifi", "numpy", "packaging"],
     extras_require={
         "dev": ["Cython"],
         "test": ["pytest", "pytest-cov"],