From 8002a13f1d17fa29fb2aafdc85f8cd3972976768 Mon Sep 17 00:00:00 2001 From: Panos Mavrogiorgos Date: Tue, 9 Apr 2024 13:51:16 +0300 Subject: [PATCH] deps: Add pyogrio as a primary dependency. --- locks/requirements-ci.txt | 3 +- locks/requirements-full.txt | 3 +- locks/requirements-viz.txt | 5 ++-- locks/requirements.txt | 5 ++-- poetry.lock | 55 +++++++++++++++++++++++++++++++++---- pyproject.toml | 3 +- 6 files changed, 60 insertions(+), 14 deletions(-) diff --git a/locks/requirements-ci.txt b/locks/requirements-ci.txt index 6c228e53..22cec9b1 100644 --- a/locks/requirements-ci.txt +++ b/locks/requirements-ci.txt @@ -49,7 +49,7 @@ importlib-metadata==7.1.0 ; python_version >= "3.9" and python_version < "3.12" importlib-resources==6.4.0 ; python_version >= "3.9" and python_version < "4.0" iniconfig==2.0.0 ; python_version >= "3.9" and python_version < "4" jinja2==3.1.3 ; python_version >= "3.9" and python_version < "4" -joblib==1.3.2 ; python_version >= "3.9" and python_version < "4" +joblib==1.4.0 ; python_version >= "3.9" and python_version < "4" kiwisolver==1.4.5 ; python_version >= "3.9" and python_version < "4" limits==3.10.1 ; python_version >= "3.9" and python_version < "4.0" llvmlite==0.42.0 ; python_version >= "3.9" and python_version < "4" @@ -74,6 +74,7 @@ pydantic-core==2.16.3 ; python_version >= "3.9" and python_version < "4.0" pydantic==2.6.4 ; python_version >= "3.9" and python_version < "4.0" pydap==3.4.1 ; python_version >= "3.9" and python_version < "4" pykdtree==1.3.11 ; python_version >= "3.9" and python_version < "4" +pyogrio==0.7.2 ; python_version >= "3.9" and python_version < "4" pyparsing==3.1.2 ; python_version >= "3.9" and python_version < "4" pyproj==3.6.1 ; python_version >= "3.9" and python_version < "4" pyresample==1.28.2 ; python_version >= "3.9" and python_version < "4" diff --git a/locks/requirements-full.txt b/locks/requirements-full.txt index b0cce941..2bcb9285 100644 --- a/locks/requirements-full.txt +++ b/locks/requirements-full.txt @@ -82,7 +82,7 @@ itk-numerics==5.3.0 ; python_version >= "3.9" and python_version < "4" itkwidgets==0.32.6 ; python_version >= "3.9" and python_version < "4" jedi==0.19.1 ; python_version >= "3.9" and python_version < "4" jinja2==3.1.3 ; python_version >= "3.9" and python_version < "4" -joblib==1.3.2 ; python_version >= "3.9" and python_version < "4" +joblib==1.4.0 ; python_version >= "3.9" and python_version < "4" jsonschema-specifications==2023.12.1 ; python_version >= "3.9" and python_version < "4" jsonschema==4.21.1 ; python_version >= "3.9" and python_version < "4" jupyter-client==8.6.1 ; python_version >= "3.9" and python_version < "4" @@ -150,6 +150,7 @@ pyface==8.0.0 ; python_version >= "3.9" and python_version < "4" pygments==2.17.2 ; python_version >= "3.9" and python_version < "4" pykdtree==1.3.11 ; python_version >= "3.9" and python_version < "4" pymdown-extensions==10.7.1 ; python_version >= "3.9" and python_version < "4" +pyogrio==0.7.2 ; python_version >= "3.9" and python_version < "4" pyparsing==3.1.2 ; python_version >= "3.9" and python_version < "4" pyproj==3.6.1 ; python_version >= "3.9" and python_version < "4" pyresample==1.28.2 ; python_version >= "3.9" and python_version < "4" diff --git a/locks/requirements-viz.txt b/locks/requirements-viz.txt index 0132312d..1f3af139 100644 --- a/locks/requirements-viz.txt +++ b/locks/requirements-viz.txt @@ -12,7 +12,6 @@ beautifulsoup4==4.12.3 ; python_version >= "3.9" and python_version < "4" bleach==6.1.0 ; python_version >= "3.9" and python_version < "4" bokeh==3.4.0 ; python_version >= "3.9" and python_version < "4" cartopy==0.22.0 ; python_version >= "3.9" and python_version < "4" -catalogue==2.0.10 ; python_version >= "3.9" and python_version < "4" certifi==2024.2.2 ; python_version >= "3.9" and python_version < "4" cffi==1.16.0 ; python_version >= "3.9" and python_version < "4" cfgrib==0.9.11.0 ; python_version >= "3.9" and python_version < "4" @@ -75,7 +74,7 @@ itk-numerics==5.3.0 ; python_version >= "3.9" and python_version < "4" itkwidgets==0.32.6 ; python_version >= "3.9" and python_version < "4" jedi==0.19.1 ; python_version >= "3.9" and python_version < "4" jinja2==3.1.3 ; python_version >= "3.9" and python_version < "4" -joblib==1.3.2 ; python_version >= "3.9" and python_version < "4" +joblib==1.4.0 ; python_version >= "3.9" and python_version < "4" jsonschema-specifications==2023.12.1 ; python_version >= "3.9" and python_version < "4" jsonschema==4.21.1 ; python_version >= "3.9" and python_version < "4" jupyter-client==8.6.1 ; python_version >= "3.9" and python_version < "4" @@ -132,6 +131,7 @@ pydap==3.4.1 ; python_version >= "3.9" and python_version < "4" pyface==8.0.0 ; python_version >= "3.9" and python_version < "4" pygments==2.17.2 ; python_version >= "3.9" and python_version < "4" pykdtree==1.3.11 ; python_version >= "3.9" and python_version < "4" +pyogrio==0.7.2 ; python_version >= "3.9" and python_version < "4" pyparsing==3.1.2 ; python_version >= "3.9" and python_version < "4" pyproj==3.6.1 ; python_version >= "3.9" and python_version < "4" pyresample==1.28.2 ; python_version >= "3.9" and python_version < "4" @@ -159,7 +159,6 @@ sniffio==1.3.1 ; python_version >= "3.9" and python_version < "4.0" snuggs==1.4.7 ; python_version >= "3.9" and python_version < "4" soupsieve==2.5 ; python_version >= "3.9" and python_version < "4" spatialpandas==0.4.10 ; python_version >= "3.9" and python_version < "4" -srsly==2.4.8 ; python_version >= "3.9" and python_version < "4" stack-data==0.6.3 ; python_version >= "3.9" and python_version < "4" terminado==0.18.1 ; python_version >= "3.9" and python_version < "4" tinycss2==1.2.1 ; python_version >= "3.9" and python_version < "4" diff --git a/locks/requirements.txt b/locks/requirements.txt index 70764594..0640aaf6 100644 --- a/locks/requirements.txt +++ b/locks/requirements.txt @@ -5,7 +5,6 @@ asciitree==0.3.3 ; python_version >= "3.9" and python_version < "4" attrs==23.2.0 ; python_version >= "3.9" and python_version < "4" beautifulsoup4==4.12.3 ; python_version >= "3.9" and python_version < "4" cartopy==0.22.0 ; python_version >= "3.9" and python_version < "4" -catalogue==2.0.10 ; python_version >= "3.9" and python_version < "4" certifi==2024.2.2 ; python_version >= "3.9" and python_version < "4" cffi==1.16.0 ; python_version >= "3.9" and python_version < "4" cfgrib==0.9.11.0 ; python_version >= "3.9" and python_version < "4" @@ -44,7 +43,7 @@ idna==3.6 ; python_version >= "3.9" and python_version < "4" importlib-metadata==7.1.0 ; python_version >= "3.9" and python_version < "3.12" importlib-resources==6.4.0 ; python_version >= "3.9" and python_version < "4.0" jinja2==3.1.3 ; python_version >= "3.9" and python_version < "4" -joblib==1.3.2 ; python_version >= "3.9" and python_version < "4" +joblib==1.4.0 ; python_version >= "3.9" and python_version < "4" kiwisolver==1.4.5 ; python_version >= "3.9" and python_version < "4" limits==3.10.1 ; python_version >= "3.9" and python_version < "4.0" llvmlite==0.42.0 ; python_version >= "3.9" and python_version < "4" @@ -66,6 +65,7 @@ pydantic-core==2.16.3 ; python_version >= "3.9" and python_version < "4.0" pydantic==2.6.4 ; python_version >= "3.9" and python_version < "4.0" pydap==3.4.1 ; python_version >= "3.9" and python_version < "4" pykdtree==1.3.11 ; python_version >= "3.9" and python_version < "4" +pyogrio==0.7.2 ; python_version >= "3.9" and python_version < "4" pyparsing==3.1.2 ; python_version >= "3.9" and python_version < "4" pyproj==3.6.1 ; python_version >= "3.9" and python_version < "4" pyresample==1.28.2 ; python_version >= "3.9" and python_version < "4" @@ -84,7 +84,6 @@ six==1.16.0 ; python_version >= "3.9" and python_version < "4" sniffio==1.3.1 ; python_version >= "3.9" and python_version < "4.0" snuggs==1.4.7 ; python_version >= "3.9" and python_version < "4" soupsieve==2.5 ; python_version >= "3.9" and python_version < "4" -srsly==2.4.8 ; python_version >= "3.9" and python_version < "4" toolz==0.12.1 ; python_version >= "3.9" and python_version < "4" tqdm==4.66.2 ; python_version >= "3.9" and python_version < "4" typing-extensions==4.11.0 ; python_version >= "3.9" and python_version < "4.0" diff --git a/poetry.lock b/poetry.lock index 5a315067..0d50f936 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2013,13 +2013,13 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "joblib" -version = "1.3.2" +version = "1.4.0" description = "Lightweight pipelining with Python functions" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "joblib-1.3.2-py3-none-any.whl", hash = "sha256:ef4331c65f239985f3f2220ecc87db222f08fd22097a3dd5698f693875f8cbb9"}, - {file = "joblib-1.3.2.tar.gz", hash = "sha256:92f865e621e17784e7955080b6d042489e3b8e294949cc44c6eac304f59772b1"}, + {file = "joblib-1.4.0-py3-none-any.whl", hash = "sha256:42942470d4062537be4d54c83511186da1fc14ba354961a2114da91efa9a4ed7"}, + {file = "joblib-1.4.0.tar.gz", hash = "sha256:1eb0dc091919cd384490de890cb5dfd538410a6d4b3b54eef09fb8c50b409b1c"}, ] [[package]] @@ -3931,6 +3931,51 @@ pyyaml = "*" [package.extras] extra = ["pygments (>=2.12)"] +[[package]] +name = "pyogrio" +version = "0.7.2" +description = "Vectorized spatial vector file format I/O using GDAL/OGR" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pyogrio-0.7.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ba386a02c9b5934c568b40acc95c9863f92075f6990167635e51368976569c66"}, + {file = "pyogrio-0.7.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:860b04ddf23b8c253ceb3621e4b0e0dc0f293eab66cb14f799a5c9f9fe0a882c"}, + {file = "pyogrio-0.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:caaf61d473ac207f170082e602ea57c096e8dd4c4be51de58fba96f1a5944096"}, + {file = "pyogrio-0.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:bee556ca305b7e8c68aada259d925c612131205074fb2373badafacbef610b77"}, + {file = "pyogrio-0.7.2-cp310-cp310-win_amd64.whl", hash = "sha256:7e2c856961efdc6cb3809b97b49016cbbcee17c8a1e85fc4000b5fcb3cfcb9b1"}, + {file = "pyogrio-0.7.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5654e7c33442cbd98e7a56f705e160415d7503b2420d724d4f81b8cc88360b3e"}, + {file = "pyogrio-0.7.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b9a8a4854c7af2c76683ce5666ee765b207901b362576465219d75deb6159821"}, + {file = "pyogrio-0.7.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a23136d1bffa9d811263807b850c6e9854201710276f09de650131e89f2486aa"}, + {file = "pyogrio-0.7.2-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:234b0d1d22e9680229b0618c25077a0cb2428cbbc2939b4bb9bdd8ee77e0f3e0"}, + {file = "pyogrio-0.7.2-cp311-cp311-win_amd64.whl", hash = "sha256:33ae5aafcf3a557e107a33f5b3e878750d2e467b8cc911dc4bf261c1a602b534"}, + {file = "pyogrio-0.7.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:73577fecebeecf0d06e78c1a4bddd460a4d57c6d918affab7594c0bc72f5fa14"}, + {file = "pyogrio-0.7.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f2ff58184020da39540a2f5d4a5412005a01b0c4cd03c7b8294bc670d1f3fe50"}, + {file = "pyogrio-0.7.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31112bb0b6a4a3f80ec3252d7eeb7be81045860d49fd76e297c073759450652b"}, + {file = "pyogrio-0.7.2-cp312-cp312-win_amd64.whl", hash = "sha256:1b7197c72f034ac7187da2a8d50a063a5f1256aab732b154f11f887a7652dc3d"}, + {file = "pyogrio-0.7.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7e39bb6bfdd74e63ae96acced7297bbe8a157f85c0107f1cbb395d2a937f3a38"}, + {file = "pyogrio-0.7.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:436de39f57e8f8cc41682981518b9490d64d3a1c48bf78d415e5747c296790dc"}, + {file = "pyogrio-0.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5feeb7a0da7ee82580f6aa6508a80602413675b99c60c822929e0e8b925e0517"}, + {file = "pyogrio-0.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:429dcff4c36f0e0a15ba4a20f2d4478b9c6d095e70c4bcc007a536ea420a1a93"}, + {file = "pyogrio-0.7.2-cp38-cp38-win_amd64.whl", hash = "sha256:f219c1edb010d0248891a3d27d15faf17c91cfe69daef84d7471e22e4ed4fcff"}, + {file = "pyogrio-0.7.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9cc6db2e5dc50dfe23554d10502920eafa0648c365725e552aaa523432a9bf35"}, + {file = "pyogrio-0.7.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:be46be43c4148a3ad09da38670411485ec544a51cbd6b7d004a0eca5035023fc"}, + {file = "pyogrio-0.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3001efd5dfee36459d0cfdafbe91ed88fc5ae734353d771cdb75546ef1427735"}, + {file = "pyogrio-0.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:892fdab0e1c44c0125254d92928081c14f93ac553f371addc2c9a1d4bde41cad"}, + {file = "pyogrio-0.7.2-cp39-cp39-win_amd64.whl", hash = "sha256:d5fc2304aeb927564f77caaa4da9a47e2d77a8ceb1c624ea84c505140886b221"}, + {file = "pyogrio-0.7.2.tar.gz", hash = "sha256:33afb7d211c6434613f24174722347a5cb11d22a212f28c817f67c89d30d0c0d"}, +] + +[package.dependencies] +certifi = "*" +numpy = "*" +packaging = "*" + +[package.extras] +benchmark = ["pytest-benchmark"] +dev = ["Cython"] +geopandas = ["geopandas"] +test = ["pytest", "pytest-cov"] + [[package]] name = "pyparsing" version = "3.1.2" @@ -5634,4 +5679,4 @@ viz = ["geoviews", "holoviews", "hvplot", "ipykernel", "itkwidgets", "matplotlib [metadata] lock-version = "2.0" python-versions = ">=3.9, <4" -content-hash = "f6734571de43e91e2c251ad643d9cce4f4fa71d9f38f042f4f1742e5506e0bc8" +content-hash = "3b82313d68e68c02a7b42b03ee5678adaec056d90fb8bfc773ecc1858c069f9e" diff --git a/pyproject.toml b/pyproject.toml index 5096fc99..adfd79ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ mayavi = { version = "*", optional = true } numba = { version = ">=0.51", optional = true } spatialpandas = { version = "*", optional = true } vtk = {version = "*", optional = true} -srsly = "*" +pyogrio = "*" [tool.poetry.extras] viz = [ @@ -91,6 +91,7 @@ viz = [ [tool.poetry.group.dev.dependencies] black = "<25.0" bump2version = "^1.0" +srsly = "*" [tool.poetry.group.test.dependencies] pytest-cov = "*"