pyogrio 0.9.0__cp311-cp311-win_amd64.whl → 0.10.0__cp311-cp311-win_amd64.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of pyogrio might be problematic. Click here for more details.
- pyogrio/__init__.py +26 -18
- pyogrio/_compat.py +7 -1
- pyogrio/_env.py +4 -6
- pyogrio/_err.c +460 -445
- pyogrio/_err.cp311-win_amd64.pyd +0 -0
- pyogrio/_geometry.c +645 -612
- pyogrio/_geometry.cp311-win_amd64.pyd +0 -0
- pyogrio/_io.c +7749 -7596
- pyogrio/_io.cp311-win_amd64.pyd +0 -0
- pyogrio/_ogr.c +601 -609
- pyogrio/_ogr.cp311-win_amd64.pyd +0 -0
- pyogrio/_version.py +3 -3
- pyogrio/_vsi.c +7570 -2514
- pyogrio/_vsi.cp311-win_amd64.pyd +0 -0
- pyogrio/core.py +86 -20
- pyogrio/errors.py +9 -16
- pyogrio/gdal_data/GDAL-targets.cmake +1 -1
- pyogrio/gdal_data/GDALConfig.cmake +0 -1
- pyogrio/gdal_data/GDALConfigVersion.cmake +3 -3
- pyogrio/gdal_data/MM_m_idofic.csv +321 -0
- pyogrio/gdal_data/gdaltileindex.xsd +269 -0
- pyogrio/gdal_data/gdalvrt.xsd +130 -22
- pyogrio/gdal_data/ogrinfo_output.schema.json +23 -0
- pyogrio/gdal_data/ogrvrt.xsd +3 -0
- pyogrio/gdal_data/pci_datum.txt +222 -155
- pyogrio/gdal_data/pci_ellips.txt +90 -38
- pyogrio/gdal_data/vcpkg.spdx.json +21 -21
- pyogrio/gdal_data/vcpkg_abi_info.txt +27 -27
- pyogrio/geopandas.py +32 -24
- pyogrio/proj_data/proj-config-version.cmake +2 -2
- pyogrio/proj_data/proj-targets.cmake +1 -1
- pyogrio/proj_data/proj.db +0 -0
- pyogrio/proj_data/proj4-targets.cmake +1 -1
- pyogrio/proj_data/projjson.schema.json +1 -1
- pyogrio/proj_data/vcpkg.spdx.json +17 -17
- pyogrio/proj_data/vcpkg_abi_info.txt +15 -15
- pyogrio/raw.py +46 -30
- pyogrio/tests/conftest.py +206 -12
- pyogrio/tests/fixtures/README.md +32 -13
- pyogrio/tests/fixtures/curve.gpkg +0 -0
- pyogrio/tests/fixtures/{test_multisurface.gpkg → curvepolygon.gpkg} +0 -0
- pyogrio/tests/fixtures/line_zm.gpkg +0 -0
- pyogrio/tests/fixtures/multisurface.gpkg +0 -0
- pyogrio/tests/test_arrow.py +178 -24
- pyogrio/tests/test_core.py +162 -72
- pyogrio/tests/test_geopandas_io.py +239 -99
- pyogrio/tests/test_path.py +29 -17
- pyogrio/tests/test_raw_io.py +165 -54
- pyogrio/tests/test_util.py +56 -0
- pyogrio/util.py +54 -30
- pyogrio-0.10.0.dist-info/DELVEWHEEL +2 -0
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/LICENSE +1 -1
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/METADATA +37 -8
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/RECORD +74 -90
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/WHEEL +1 -1
- pyogrio.libs/{Lerc-5e4d8cbeeabca06f95e2270792304dc3.dll → Lerc-089e3fef3df84b17326dcddbf1dedaa4.dll} +0 -0
- pyogrio.libs/{gdal-b434963605a006e01c486c0df6dea4e0.dll → gdal-debee5933f0da7bb90b4bcd009023377.dll} +0 -0
- pyogrio.libs/{geos-f0622d0794b81c937a851b2e6fa9b712.dll → geos-ace4c5b5c1f569bb4213e7bbd0b0322e.dll} +0 -0
- pyogrio.libs/{geos_c-0e16bf70612fc3301d077b9d863a3fdb.dll → geos_c-7478ca0a86136b280d9b2d245c6f6627.dll} +0 -0
- pyogrio.libs/geotiff-c8fe8a095520a4ea4e465d27e06add3a.dll +0 -0
- pyogrio.libs/{iconv-2-8fcc23ddc6f096c45871011b6e008b44.dll → iconv-2-27352d156a5467ca5383d3951093ea5a.dll} +0 -0
- pyogrio.libs/{jpeg62-2f9b7af22d78338e8f0be0058503dc35.dll → jpeg62-e56b6f95a95af498f4623b8da4cebd46.dll} +0 -0
- pyogrio.libs/{json-c-e52a077545e4057de42beb4948289b41.dll → json-c-c84940e2654a4f8468bfcf2ce992aa93.dll} +0 -0
- pyogrio.libs/libcurl-d69cfd4ad487d53d58743b6778ec85e7.dll +0 -0
- pyogrio.libs/{libexpat-fbe03ca8917dfda776562d4338b289b8.dll → libexpat-6576a8d02641b6a3dbad35901ec200a7.dll} +0 -0
- pyogrio.libs/liblzma-9ee4accb476ec1ae24e924953140273d.dll +0 -0
- pyogrio.libs/{libpng16-13928571ad910705eae8d7dd8eef8b11.dll → libpng16-7c36142dda59f186f6bb683e8dae2bfe.dll} +0 -0
- pyogrio.libs/{msvcp140-46db46e967c8db2cb7a20fc75872a57e.dll → msvcp140-98b3e5b80de1e5e9d1703b786d795623.dll} +0 -0
- pyogrio.libs/proj-a408c5327f3fd2f5fabe8c56815beed7.dll +0 -0
- pyogrio.libs/{qhull_r-c45abde5d0c92faf723cc2942138af77.dll → qhull_r-516897f855568caab1ab1fe37912766c.dll} +0 -0
- pyogrio.libs/sqlite3-9bc109d8536d5ed9666332fec94485fc.dll +0 -0
- pyogrio.libs/{tiff-43630f30487a9015213475ae86ed3fa3.dll → tiff-9b3f605fffe0bccc0a964c374ee4f820.dll} +0 -0
- pyogrio.libs/{zlib1-e1272810861a13dd8d6cff3beac47f17.dll → zlib1-e5af16a15c63f05bd82d90396807ae5b.dll} +0 -0
- pyogrio/_err.pxd +0 -4
- pyogrio/_err.pyx +0 -250
- pyogrio/_geometry.pxd +0 -4
- pyogrio/_geometry.pyx +0 -129
- pyogrio/_io.pxd +0 -0
- pyogrio/_io.pyx +0 -2742
- pyogrio/_ogr.pxd +0 -444
- pyogrio/_ogr.pyx +0 -346
- pyogrio/_vsi.pxd +0 -4
- pyogrio/_vsi.pyx +0 -140
- pyogrio/arrow_bridge.h +0 -115
- pyogrio/gdal_data/bag_template.xml +0 -201
- pyogrio/gdal_data/gmlasconf.xml +0 -169
- pyogrio/gdal_data/gmlasconf.xsd +0 -1066
- pyogrio/gdal_data/netcdf_config.xsd +0 -143
- pyogrio/gdal_data/template_tiles.mapml +0 -28
- pyogrio/tests/fixtures/poly_not_enough_points.shp.zip +0 -0
- pyogrio/tests/fixtures/test_datetime.geojson +0 -7
- pyogrio/tests/fixtures/test_datetime_tz.geojson +0 -8
- pyogrio/tests/fixtures/test_fgdb.gdb.zip +0 -0
- pyogrio/tests/fixtures/test_nested.geojson +0 -18
- pyogrio/tests/fixtures/test_ogr_types_list.geojson +0 -12
- pyogrio-0.9.0.dist-info/DELVEWHEEL +0 -2
- pyogrio.libs/geotiff-772e7c705fb15ddf91b432adb4eb1f6c.dll +0 -0
- pyogrio.libs/libcurl-bc81cd8afe15b10c0821b181b6af8bd0.dll +0 -0
- pyogrio.libs/liblzma-6b36f24d54d3dd45f274a2aebef81085.dll +0 -0
- pyogrio.libs/proj-8a30239ef2dfc3b9dd2bb48e8abb330f.dll +0 -0
- pyogrio.libs/sqlite3-df30c3cf230727e23c43c40126a530f7.dll +0 -0
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/top_level.txt +0 -0
pyogrio/__init__.py
CHANGED
|
@@ -1,40 +1,45 @@
|
|
|
1
|
-
"""
|
|
2
|
-
|
|
1
|
+
"""Vectorized vector I/O using OGR."""
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
# start delvewheel patch
|
|
5
|
+
def _delvewheel_patch_1_8_2():
|
|
3
6
|
import os
|
|
4
7
|
libs_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, 'pyogrio.libs'))
|
|
5
8
|
if os.path.isdir(libs_dir):
|
|
6
9
|
os.add_dll_directory(libs_dir)
|
|
7
10
|
|
|
8
11
|
|
|
9
|
-
|
|
10
|
-
del
|
|
12
|
+
_delvewheel_patch_1_8_2()
|
|
13
|
+
del _delvewheel_patch_1_8_2
|
|
11
14
|
# end delvewheel patch
|
|
12
15
|
|
|
13
16
|
try:
|
|
14
17
|
# we try importing shapely, to ensure it is imported (and it can load its
|
|
15
18
|
# own GEOS copy) before we load GDAL and its linked GEOS
|
|
16
|
-
import shapely
|
|
17
|
-
import shapely.geos # noqa
|
|
19
|
+
import shapely
|
|
20
|
+
import shapely.geos # noqa: F401
|
|
18
21
|
except Exception:
|
|
19
22
|
pass
|
|
20
23
|
|
|
24
|
+
from pyogrio._version import get_versions
|
|
21
25
|
from pyogrio.core import (
|
|
22
|
-
|
|
26
|
+
__gdal_geos_version__,
|
|
27
|
+
__gdal_version__,
|
|
28
|
+
__gdal_version_string__,
|
|
23
29
|
detect_write_driver,
|
|
30
|
+
get_gdal_config_option,
|
|
31
|
+
get_gdal_data_path,
|
|
32
|
+
list_drivers,
|
|
24
33
|
list_layers,
|
|
25
34
|
read_bounds,
|
|
26
35
|
read_info,
|
|
27
36
|
set_gdal_config_options,
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
__gdal_version_string__,
|
|
32
|
-
__gdal_geos_version__,
|
|
37
|
+
vsi_listtree,
|
|
38
|
+
vsi_rmtree,
|
|
39
|
+
vsi_unlink,
|
|
33
40
|
)
|
|
34
|
-
from pyogrio.raw import read_arrow, open_arrow, write_arrow
|
|
35
41
|
from pyogrio.geopandas import read_dataframe, write_dataframe
|
|
36
|
-
from pyogrio.
|
|
37
|
-
|
|
42
|
+
from pyogrio.raw import open_arrow, read_arrow, write_arrow
|
|
38
43
|
|
|
39
44
|
__version__ = get_versions()["version"]
|
|
40
45
|
del get_versions
|
|
@@ -48,13 +53,16 @@ __all__ = [
|
|
|
48
53
|
"set_gdal_config_options",
|
|
49
54
|
"get_gdal_config_option",
|
|
50
55
|
"get_gdal_data_path",
|
|
51
|
-
"read_arrow",
|
|
52
56
|
"open_arrow",
|
|
53
|
-
"
|
|
57
|
+
"read_arrow",
|
|
54
58
|
"read_dataframe",
|
|
59
|
+
"vsi_listtree",
|
|
60
|
+
"vsi_rmtree",
|
|
61
|
+
"vsi_unlink",
|
|
62
|
+
"write_arrow",
|
|
55
63
|
"write_dataframe",
|
|
56
64
|
"__gdal_version__",
|
|
57
65
|
"__gdal_version_string__",
|
|
58
66
|
"__gdal_geos_version__",
|
|
59
67
|
"__version__",
|
|
60
|
-
]
|
|
68
|
+
]
|
pyogrio/_compat.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
from packaging.version import Version
|
|
2
2
|
|
|
3
|
-
from pyogrio.core import
|
|
3
|
+
from pyogrio.core import __gdal_geos_version__, __gdal_version__
|
|
4
4
|
|
|
5
5
|
# detect optional dependencies
|
|
6
6
|
try:
|
|
@@ -8,6 +8,11 @@ try:
|
|
|
8
8
|
except ImportError:
|
|
9
9
|
pyarrow = None
|
|
10
10
|
|
|
11
|
+
try:
|
|
12
|
+
import pyproj
|
|
13
|
+
except ImportError:
|
|
14
|
+
pyproj = None
|
|
15
|
+
|
|
11
16
|
try:
|
|
12
17
|
import shapely
|
|
13
18
|
except ImportError:
|
|
@@ -27,6 +32,7 @@ except ImportError:
|
|
|
27
32
|
HAS_ARROW_API = __gdal_version__ >= (3, 6, 0)
|
|
28
33
|
HAS_ARROW_WRITE_API = __gdal_version__ >= (3, 8, 0)
|
|
29
34
|
HAS_PYARROW = pyarrow is not None
|
|
35
|
+
HAS_PYPROJ = pyproj is not None
|
|
30
36
|
|
|
31
37
|
HAS_GEOPANDAS = geopandas is not None
|
|
32
38
|
|
pyogrio/_env.py
CHANGED
|
@@ -4,13 +4,11 @@
|
|
|
4
4
|
# adapted from Fiona: https://github.com/Toblerity/Fiona/pull/875
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
from contextlib import contextmanager
|
|
8
7
|
import logging
|
|
9
8
|
import os
|
|
10
|
-
from pathlib import Path
|
|
11
9
|
import platform
|
|
12
|
-
import
|
|
13
|
-
|
|
10
|
+
from contextlib import contextmanager
|
|
11
|
+
from pathlib import Path
|
|
14
12
|
|
|
15
13
|
log = logging.getLogger(__name__)
|
|
16
14
|
log.addHandler(logging.NullHandler())
|
|
@@ -29,10 +27,10 @@ except ImportError:
|
|
|
29
27
|
|
|
30
28
|
gdal_dll_dir = None
|
|
31
29
|
|
|
32
|
-
if platform.system() == "Windows"
|
|
30
|
+
if platform.system() == "Windows":
|
|
33
31
|
# if loading of extension modules fails, search for gdal dll directory
|
|
34
32
|
try:
|
|
35
|
-
import pyogrio._io #
|
|
33
|
+
import pyogrio._io # noqa: F401
|
|
36
34
|
|
|
37
35
|
except ImportError:
|
|
38
36
|
for path in os.getenv("PATH", "").split(os.pathsep):
|