pyogrio 0.9.0__cp39-cp39-win_amd64.whl → 0.10.0__cp39-cp39-win_amd64.whl

pyogrio/__init__.py

@@ -1,5 +1,8 @@
-"""""" # start delvewheel patch
-def _delvewheel_patch_1_6_0():
+"""Vectorized vector I/O using OGR."""
+
+
+# start delvewheel patch
+def _delvewheel_patch_1_8_2():
     import ctypes
     import os
     import platform
@@ -10,46 +13,51 @@ def _delvewheel_patch_1_6_0():
         if os.path.isdir(libs_dir):
             os.add_dll_directory(libs_dir)
     else:
-        load_order_filepath = os.path.join(libs_dir, '.load-order-pyogrio-0.9.0')
+        load_order_filepath = os.path.join(libs_dir, '.load-order-pyogrio-0.10.0')
         if os.path.isfile(load_order_filepath):
-            with open(os.path.join(libs_dir, '.load-order-pyogrio-0.9.0')) as file:
+            import ctypes.wintypes
+            with open(os.path.join(libs_dir, '.load-order-pyogrio-0.10.0')) as file:
                 load_order = file.read().split()
+            kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
+            kernel32.LoadLibraryExW.restype = ctypes.wintypes.HMODULE
+            kernel32.LoadLibraryExW.argtypes = ctypes.wintypes.LPCWSTR, ctypes.wintypes.HANDLE, ctypes.wintypes.DWORD
             for lib in load_order:
                 lib_path = os.path.join(os.path.join(libs_dir, lib))
-                kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
-                if os.path.isfile(lib_path) and not kernel32.LoadLibraryExW(ctypes.c_wchar_p(lib_path), None, 0x00000008):
+                if os.path.isfile(lib_path) and not kernel32.LoadLibraryExW(lib_path, None, 8):
                     raise OSError('Error loading {}; {}'.format(lib, ctypes.FormatError(ctypes.get_last_error())))
 
 
-_delvewheel_patch_1_6_0()
-del _delvewheel_patch_1_6_0
+_delvewheel_patch_1_8_2()
+del _delvewheel_patch_1_8_2
 # end delvewheel patch
 
 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
@@ -63,13 +71,16 @@ __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__",
     "__gdal_geos_version__",
     "__version__",
-]
+]

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):