pyogrio 0.8.0__cp312-cp312-manylinux_2_28_aarch64.whl → 0.10.0__cp312-cp312-manylinux_2_28_aarch64.whl

pyogrio/util.py

@@ -1,13 +1,17 @@
-from pathlib import Path
+"""Utility functions."""
+
 import re
 import sys
+from packaging.version import Version
+from pathlib import Path
+from typing import Union
 from urllib.parse import urlparse
 
-from packaging.version import Version
+from pyogrio._vsi import vsimem_rmtree_toplevel as _vsimem_rmtree_toplevel
 
 
 def get_vsi_path_or_buffer(path_or_buffer):
-    """Get vsi-prefixed path or bytes buffer depending on type of path_or_buffer
+    """Get VSI-prefixed path or bytes buffer depending on type of path_or_buffer.
 
     If path_or_buffer is a bytes object, it will be returned directly and will
     be read into an in-memory dataset when passed to one of the Cython functions.
@@ -21,15 +25,17 @@ def get_vsi_path_or_buffer(path_or_buffer):
     Parameters
     ----------
     path_or_buffer : str, pathlib.Path, bytes, or file-like
+        A dataset path or URI, raw buffer, or file-like object with a read method.
 
     Returns
     -------
     str or bytes
-    """
 
-    # force path objects to string to specifically ignore their read method
+    """
+    # treat Path objects here already to ignore their read method + to avoid backslashes
+    # on Windows.
     if isinstance(path_or_buffer, Path):
-        return vsi_path(str(path_or_buffer))
+        return vsi_path(path_or_buffer)
 
     if isinstance(path_or_buffer, bytes):
         return path_or_buffer
@@ -38,7 +44,7 @@ def get_vsi_path_or_buffer(path_or_buffer):
         bytes_buffer = path_or_buffer.read()
 
         # rewind buffer if possible so that subsequent operations do not need to rewind
-        if hasattr(path_or_buffer, "seek"):
+        if hasattr(path_or_buffer, "seekable") and path_or_buffer.seekable():
             path_or_buffer.seek(0)
 
         return bytes_buffer
@@ -46,16 +52,14 @@ def get_vsi_path_or_buffer(path_or_buffer):
     return vsi_path(str(path_or_buffer))
 
 
-def vsi_path(path: str) -> str:
-    """
-    Ensure path is a local path or a GDAL-compatible vsi path.
-
-    """
-
-    if "/vsimem/" in path:
-        raise ValueError(
-            "path cannot contain /vsimem/ directly; to use an in-memory dataset a bytes object must be passed instead"
-        )
+def vsi_path(path: Union[str, Path]) -> str:
+    """Ensure path is a local path or a GDAL-compatible VSI path."""
+    # Convert Path objects to string, but for VSI paths, keep posix style path.
+    if isinstance(path, Path):
+        if sys.platform == "win32" and path.as_posix().startswith("/vsi"):
+            path = path.as_posix()
+        else:
+            path = str(path)
 
     # path is already in GDAL format
     if path.startswith("/vsi"):
@@ -98,12 +102,11 @@ SCHEMES = {
     # those are for now not added as supported URI
 }
 
-CURLSCHEMES = set([k for k, v in SCHEMES.items() if v == "curl"])
+CURLSCHEMES = {k for k, v in SCHEMES.items() if v == "curl"}
 
 
 def _parse_uri(path: str):
-    """
-    Parse a URI
+    """Parse a URI.
 
     Returns a tuples of (path, archive, scheme)
 
@@ -115,7 +118,7 @@ def _parse_uri(path: str):
     scheme : str
         URI scheme such as "https" or "zip+s3".
     """
-    parts = urlparse(path)
+    parts = urlparse(path, allow_fragments=False)
 
     # if the scheme is not one of GDAL's supported schemes, return raw path
     if parts.scheme and not all(p in SCHEMES for p in parts.scheme.split("+")):
@@ -138,8 +141,7 @@ def _parse_uri(path: str):
 
 
 def _construct_vsi_path(path, archive, scheme) -> str:
-    """Convert a parsed path to a GDAL VSI path"""
-
+    """Convert a parsed path to a GDAL VSI path."""
     prefix = ""
     suffix = ""
     schemes = scheme.split("+")
@@ -148,9 +150,7 @@ def _construct_vsi_path(path, archive, scheme) -> str:
         schemes.insert(0, "zip")
 
     if schemes:
-        prefix = "/".join(
-            "vsi{0}".format(SCHEMES[p]) for p in schemes if p and p != "file"
-        )
+        prefix = "/".join(f"vsi{SCHEMES[p]}" for p in schemes if p and p != "file")
 
         if schemes[-1] in CURLSCHEMES:
             suffix = f"{schemes[-1]}://"
@@ -159,15 +159,15 @@ def _construct_vsi_path(path, archive, scheme) -> str:
         if archive:
             return "/{}/{}{}/{}".format(prefix, suffix, archive, path.lstrip("/"))
         else:
-            return "/{}/{}{}".format(prefix, suffix, path)
+            return f"/{prefix}/{suffix}{path}"
 
     return path
 
 
 def _preprocess_options_key_value(options):
-    """
-    Preprocess options, eg `spatial_index=True` gets converted
-    to `SPATIAL_INDEX="YES"`.
+    """Preprocess options.
+
+    For example, `spatial_index=True` gets converted to `SPATIAL_INDEX="YES"`.
     """
     if not isinstance(options, dict):
         raise TypeError(f"Expected options to be a dict, got {type(options)}")
@@ -191,6 +191,7 @@ def _mask_to_wkb(mask):
     Parameters
     ----------
     mask : Shapely geometry
+        The geometry to convert to WKB.
 
     Returns
     -------
@@ -201,8 +202,8 @@ def _mask_to_wkb(mask):
     ValueError
         raised if Shapely >= 2.0 is not available or mask is not a Shapely
         Geometry object
-    """
 
+    """
     if mask is None:
         return mask
 
@@ -221,3 +222,26 @@ def _mask_to_wkb(mask):
         raise ValueError("'mask' parameter must be a Shapely geometry")
 
     return shapely.to_wkb(mask)
+
+
+def vsimem_rmtree_toplevel(path: Union[str, Path]):
+    """Remove the parent directory of the file path recursively.
+
+    This is used for final cleanup of an in-memory dataset, which may have been
+    created within a directory to contain sibling files.
+
+    Additional VSI handlers may be chained to the left of /vsimem/ in path and
+    will be ignored.
+
+    Remark: function is defined here to be able to run tests on it.
+
+    Parameters
+    ----------
+    path : str or pathlib.Path
+        path to in-memory file
+
+    """
+    if isinstance(path, Path):
+        path = path.as_posix()
+
+    _vsimem_rmtree_toplevel(path)

{pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Brendan C. Ward and pyogrio contributors
+Copyright (c) 2020-2024 Brendan C. Ward and pyogrio contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/METADATA

@@ -1,12 +1,41 @@
 Metadata-Version: 2.1
 Name: pyogrio
-Version: 0.8.0
+Version: 0.10.0
 Summary: Vectorized spatial vector file format I/O using GDAL/OGR
-Home-page: https://github.com/geopandas/pyogrio
-Author: Brendan C. Ward
-Author-email: bcward@astutespruce.com
-License: MIT
-Requires-Python: >=3.8
+Author: pyogrio contributors
+Author-email: "Brendan C. Ward" <bcward@astutespruce.com>
+Maintainer: pyogrio contributors
+License: MIT License
+        
+        Copyright (c) 2020-2024 Brendan C. Ward and pyogrio contributors
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: Home, https://pyogrio.readthedocs.io/
+Project-URL: Repository, https://github.com/geopandas/pyogrio
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Scientific/Engineering :: GIS
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi
@@ -15,7 +44,7 @@ Requires-Dist: packaging
 Provides-Extra: benchmark
 Requires-Dist: pytest-benchmark ; extra == 'benchmark'
 Provides-Extra: dev
-Requires-Dist: Cython ; extra == 'dev'
+Requires-Dist: cython ; extra == 'dev'
 Provides-Extra: geopandas
 Requires-Dist: geopandas ; extra == 'geopandas'
 Provides-Extra: test
@@ -56,7 +85,7 @@ substantial change. Please see [CHANGES](CHANGES.md).
 
 ## Requirements
 
-Supports Python 3.8 - 3.11 and GDAL 3.4.x - 3.8.x.
+Supports Python 3.9 - 3.13 and GDAL 3.4.x - 3.9.x.
 
 Reading to GeoDataFrames requires `geopandas>=0.12` with `shapely>=2`.