pyogrio 0.9.0__cp311-cp311-macosx_12_0_arm64.whl → 0.10.0__cp311-cp311-macosx_12_0_arm64.whl

pyogrio/__init__.py

@@ -1,28 +1,32 @@
+"""Vectorized vector I/O using OGR."""
+
 try:
     # we try importing shapely, to ensure it is imported (and it can load its
     # own GEOS copy) before we load GDAL and its linked GEOS
-    import shapely  # noqa
-    import shapely.geos  # noqa
+    import shapely
+    import shapely.geos  # noqa: F401
 except Exception:
     pass
 
+from pyogrio._version import get_versions
 from pyogrio.core import (
-    list_drivers,
+    __gdal_geos_version__,
+    __gdal_version__,
+    __gdal_version_string__,
     detect_write_driver,
+    get_gdal_config_option,
+    get_gdal_data_path,
+    list_drivers,
     list_layers,
     read_bounds,
     read_info,
     set_gdal_config_options,
-    get_gdal_config_option,
-    get_gdal_data_path,
-    __gdal_version__,
-    __gdal_version_string__,
-    __gdal_geos_version__,
+    vsi_listtree,
+    vsi_rmtree,
+    vsi_unlink,
 )
-from pyogrio.raw import read_arrow, open_arrow, write_arrow
 from pyogrio.geopandas import read_dataframe, write_dataframe
-from pyogrio._version import get_versions
-
+from pyogrio.raw import open_arrow, read_arrow, write_arrow
 
 __version__ = get_versions()["version"]
 del get_versions
@@ -36,10 +40,13 @@ __all__ = [
     "set_gdal_config_options",
     "get_gdal_config_option",
     "get_gdal_data_path",
-    "read_arrow",
     "open_arrow",
-    "write_arrow",
+    "read_arrow",
     "read_dataframe",
+    "vsi_listtree",
+    "vsi_rmtree",
+    "vsi_unlink",
+    "write_arrow",
     "write_dataframe",
     "__gdal_version__",
     "__gdal_version_string__",

pyogrio/_compat.py

@@ -1,6 +1,6 @@
 from packaging.version import Version
 
-from pyogrio.core import __gdal_version__, __gdal_geos_version__
+from pyogrio.core import __gdal_geos_version__, __gdal_version__
 
 # detect optional dependencies
 try:
@@ -8,6 +8,11 @@ try:
 except ImportError:
     pyarrow = None
 
+try:
+    import pyproj
+except ImportError:
+    pyproj = None
+
 try:
     import shapely
 except ImportError:
@@ -27,6 +32,7 @@ except ImportError:
 HAS_ARROW_API = __gdal_version__ >= (3, 6, 0)
 HAS_ARROW_WRITE_API = __gdal_version__ >= (3, 8, 0)
 HAS_PYARROW = pyarrow is not None
+HAS_PYPROJ = pyproj is not None
 
 HAS_GEOPANDAS = geopandas is not None
 

pyogrio/_env.py

@@ -4,13 +4,11 @@
 # adapted from Fiona: https://github.com/Toblerity/Fiona/pull/875
 
 
-from contextlib import contextmanager
 import logging
 import os
-from pathlib import Path
 import platform
-import sys
-
+from contextlib import contextmanager
+from pathlib import Path
 
 log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
@@ -29,10 +27,10 @@ except ImportError:
 
 gdal_dll_dir = None
 
-if platform.system() == "Windows" and sys.version_info >= (3, 8):
+if platform.system() == "Windows":
     # if loading of extension modules fails, search for gdal dll directory
     try:
-        import pyogrio._io  # NOQA
+        import pyogrio._io  # noqa: F401
 
     except ImportError:
         for path in os.getenv("PATH", "").split(os.pathsep):

pyogrio/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-06-17T12:28:58-0700",
+ "date": "2024-09-28T11:22:57-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "568f87062a65e0452c679624cc33fbf1af535454",
- "version": "0.9.0"
+ "full-revisionid": "eb8e7889224155ffa0f779360db29f07f370eef1",
+ "version": "0.10.0"
 }
 '''  # END VERSION_JSON
 

pyogrio/core.py

@@ -1,27 +1,36 @@
+"""Core functions to interact with OGR data sources."""
+
+from pathlib import Path
+from typing import Optional, Union
+
 from pyogrio._env import GDALEnv
 from pyogrio.util import (
-    get_vsi_path_or_buffer,
-    _preprocess_options_key_value,
     _mask_to_wkb,
+    _preprocess_options_key_value,
+    get_vsi_path_or_buffer,
 )
 
-
 with GDALEnv():
+    from pyogrio._err import _register_error_handler
+    from pyogrio._io import ogr_list_layers, ogr_read_bounds, ogr_read_info
     from pyogrio._ogr import (
-        get_gdal_version,
-        get_gdal_version_string,
-        get_gdal_geos_version,
-        ogr_list_drivers,
-        set_gdal_config_options as _set_gdal_config_options,
+        _get_drivers_for_path,
+        _register_drivers,
         get_gdal_config_option as _get_gdal_config_option,
         get_gdal_data_path as _get_gdal_data_path,
+        get_gdal_geos_version,
+        get_gdal_version,
+        get_gdal_version_string,
         init_gdal_data as _init_gdal_data,
         init_proj_data as _init_proj_data,
-        _register_drivers,
-        _get_drivers_for_path,
+        ogr_list_drivers,
+        set_gdal_config_options as _set_gdal_config_options,
+    )
+    from pyogrio._vsi import (
+        ogr_vsi_listtree,
+        ogr_vsi_rmtree,
+        ogr_vsi_unlink,
     )
-    from pyogrio._err import _register_error_handler
-    from pyogrio._io import ogr_list_layers, ogr_read_bounds, ogr_read_info
 
     _init_gdal_data()
     _init_proj_data()
@@ -48,8 +57,8 @@ def list_drivers(read=False, write=False):
     dict
         Mapping of driver name to file mode capabilities: ``"r"``: read, ``"w"``: write.
         Drivers that are available but with unknown support are marked with ``"?"``
-    """
 
+    """
     drivers = ogr_list_drivers()
 
     if read:
@@ -62,8 +71,9 @@ def list_drivers(read=False, write=False):
 
 
 def detect_write_driver(path):
-    """Attempt to infer the driver for a path by extension or prefix.  Only
-    drivers that support write capabilities will be detected.
+    """Attempt to infer the driver for a path by extension or prefix.
+
+    Only drivers that support write capabilities will be detected.
 
     If the path cannot be resolved to a single driver, a ValueError will be
     raised.
@@ -71,11 +81,13 @@ def detect_write_driver(path):
     Parameters
     ----------
     path : str
+        data source path
 
     Returns
     -------
     str
         name of the driver, if detected
+
     """
     # try to infer driver from path
     drivers = _get_drivers_for_path(path)
@@ -106,14 +118,15 @@ def list_layers(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
     -------
     ndarray shape (2, n)
         array of pairs of [<layer name>, <layer geometry type>]
         Note: geometry is `None` for nonspatial layers.
-    """
 
+    """
     return ogr_list_layers(get_vsi_path_or_buffer(path_or_buffer))
 
 
@@ -136,6 +149,7 @@ def read_bounds(
     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.
     layer : int or str, optional (default: first layer)
         If an integer is provided, it corresponds to the index of the layer
         with the data source.  If a string is provided, it must match the name
@@ -172,8 +186,8 @@ def read_bounds(
         fids are global IDs read from the FID field of the dataset
         bounds are ndarray of shape(4, n) containing ``xmin``, ``ymin``, ``xmax``,
         ``ymax``
-    """
 
+    """
     return ogr_read_bounds(
         get_vsi_path_or_buffer(path_or_buffer),
         layer=layer,
@@ -222,6 +236,7 @@ def read_info(
     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.
     layer : [type], optional
         Name or index of layer in data source.  Reads the first layer by default.
     encoding : [type], optional (default: None)
@@ -257,8 +272,8 @@ def read_info(
                 "dataset_metadata": "<dict of dataset metadata or None>"
                 "layer_metadata": "<dict of layer metadata or None>"
             }
-    """
 
+    """
     dataset_kwargs = _preprocess_options_key_value(kwargs) if kwargs else {}
 
     return ogr_read_info(
@@ -288,8 +303,8 @@ def set_gdal_config_options(options):
         configuration options.  ``True`` / ``False`` are normalized to ``'ON'``
         / ``'OFF'``. A value of ``None`` for a config option can be used to clear out a
         previously set value.
-    """
 
+    """
     _set_gdal_config_options(options)
 
 
@@ -305,8 +320,8 @@ def get_gdal_config_option(name):
     -------
     value of the option or None if not set
         ``'ON'`` / ``'OFF'`` are normalized to ``True`` / ``False``.
-    """
 
+    """
     return _get_gdal_config_option(name)
 
 
@@ -316,5 +331,56 @@ def get_gdal_data_path():
     Returns
     -------
     str, or None if data directory was not found
+
     """
     return _get_gdal_data_path()
+
+
+def vsi_listtree(path: Union[str, Path], pattern: Optional[str] = None):
+    """Recursively list the contents of a VSI directory.
+
+    An fnmatch pattern can be specified to filter the directories/files
+    returned.
+
+    Parameters
+    ----------
+    path : str or pathlib.Path
+        Path to the VSI directory to be listed.
+    pattern : str, optional
+        Pattern to filter results, in fnmatch format.
+
+    """
+    if isinstance(path, Path):
+        path = path.as_posix()
+
+    return ogr_vsi_listtree(path, pattern=pattern)
+
+
+def vsi_rmtree(path: Union[str, Path]):
+    """Recursively remove VSI directory.
+
+    Parameters
+    ----------
+    path : str or pathlib.Path
+        path to the VSI directory to be removed.
+
+    """
+    if isinstance(path, Path):
+        path = path.as_posix()
+
+    ogr_vsi_rmtree(path)
+
+
+def vsi_unlink(path: Union[str, Path]):
+    """Remove a VSI file.
+
+    Parameters
+    ----------
+    path : str or pathlib.Path
+        path to vsimem file to be removed
+
+    """
+    if isinstance(path, Path):
+        path = path.as_posix()
+
+    ogr_vsi_unlink(path)

pyogrio/errors.py

@@ -1,32 +1,25 @@
-class DataSourceError(RuntimeError):
-    """Errors relating to opening or closing an OGRDataSource (with >= 1 layers)"""
+"""Custom errors."""
+
 
-    pass
+class DataSourceError(RuntimeError):
+    """Errors relating to opening or closing an OGRDataSource (with >= 1 layers)."""
 
 
 class DataLayerError(RuntimeError):
-    """Errors relating to working with a single OGRLayer"""
-
-    pass
+    """Errors relating to working with a single OGRLayer."""
 
 
 class CRSError(DataLayerError):
-    """Errors relating to getting or setting CRS values"""
-
-    pass
+    """Errors relating to getting or setting CRS values."""
 
 
 class FeatureError(DataLayerError):
-    """Errors related to reading or writing a feature"""
-
-    pass
+    """Errors related to reading or writing a feature."""
 
 
 class GeometryError(DataLayerError):
-    """Errors relating to getting or setting a geometry field"""
-
-    pass
+    """Errors relating to getting or setting a geometry field."""
 
 
 class FieldError(DataLayerError):
-    """Errors relating to getting or setting a non-geometry field"""
+    """Errors relating to getting or setting a non-geometry field."""

pyogrio/gdal_data/GDAL-targets-release.cmake

@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 # Import target "GDAL::GDAL" for configuration "Release"
 set_property(TARGET GDAL::GDAL APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(GDAL::GDAL PROPERTIES
-  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libgdal.34.3.8.5.dylib"
-  IMPORTED_SONAME_RELEASE "@rpath/libgdal.34.dylib"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libgdal.35.3.9.1.dylib"
+  IMPORTED_SONAME_RELEASE "@rpath/libgdal.35.dylib"
   )
 
 list(APPEND _cmake_import_check_targets GDAL::GDAL )
-list(APPEND _cmake_import_check_files_for_GDAL::GDAL "${_IMPORT_PREFIX}/lib/libgdal.34.3.8.5.dylib" )
+list(APPEND _cmake_import_check_files_for_GDAL::GDAL "${_IMPORT_PREFIX}/lib/libgdal.35.3.9.1.dylib" )
 
 # Commands beyond this point should not need to know the version.
 set(CMAKE_IMPORT_FILE_VERSION)

pyogrio/gdal_data/GDAL-targets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
    message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.3...3.27)
+cmake_policy(VERSION 2.8.3...3.28)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

pyogrio/gdal_data/GDALConfig.cmake

@@ -14,7 +14,6 @@ list(APPEND CMAKE_PROGRAM_PATH "${vcpkg_host_prefix}/tools/pkgconf")
 include("${CMAKE_CURRENT_LIST_DIR}/DefineFindPackage2.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/GdalFindModulePath.cmake")
 find_dependency(Threads)
-find_dependency(PROJ 9 CONFIG)
 
     if(DEFINED _gdal_module_path_backup)
         set(CMAKE_MODULE_PATH  "${_gdal_module_path_backup}")

pyogrio/gdal_data/GDALConfigVersion.cmake

@@ -10,13 +10,13 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "3.8.5")
+set(PACKAGE_VERSION "3.9.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("3.8.5" MATCHES "^([0-9]+)\\.([0-9]+)")
+  if("3.9.1" MATCHES "^([0-9]+)\\.([0-9]+)")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
 
@@ -27,7 +27,7 @@ else()
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "3.8.5")
+    set(CVF_VERSION_MAJOR "3.9.1")
     set(CVF_VERSION_MINOR "")
   endif()