From ad252a8f32aa2c0a9b0abf419640ae2c1e30381b Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Mon, 24 Jun 2024 14:39:15 -0400 Subject: [PATCH 1/2] build: update geopandas to 1.0.0 --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index f414f8390..5c96e12b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -338,9 +338,9 @@ fiona==1.10.0 \ gdal==3.8.4 \ --hash=sha256:7c51e0ae7a7ccf43ad9e4bf435176baa9276653dfa16fd167c3632f6e7275207 # via soil-id -geopandas==0.14.4 \ - --hash=sha256:3bb6473cb59d51e1a7fe2dbc24a1a063fb0ebdeddf3ce08ddbf8c7ddc99689aa \ - --hash=sha256:56765be9d58e2c743078085db3bd07dc6be7719f0dbe1dfdc1d705cb80be7c25 +geopandas==1.0.0 \ + --hash=sha256:386d42c028047e2b0f09191d7859268304761c4711a247173a88891b6161f711 \ + --hash=sha256:cdd3ddf3c9f978997c7f08d0c544b6f887c94af4bc2e01e3df3ae69a43510df3 # via # -r requirements/base.in # soil-id From a0cc084ab9845efe17d752a68524084857dfc0ac Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Fri, 6 Sep 2024 16:57:19 -0400 Subject: [PATCH 2/2] fix: use fiona as pyogrio engine --- terraso_backend/apps/core/gis/parsers.py | 2 ++ terraso_backend/tests/graphql/test_shared_data.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/terraso_backend/apps/core/gis/parsers.py b/terraso_backend/apps/core/gis/parsers.py index 395800ca0..d76e1c56c 100644 --- a/terraso_backend/apps/core/gis/parsers.py +++ b/terraso_backend/apps/core/gis/parsers.py @@ -31,6 +31,8 @@ logger = structlog.get_logger(__name__) +gpd.options.io_engine = "fiona" + supported_drivers["KML"] = "rw" supported_drivers["LIBKML"] = "rw" supported_drivers["GPX"] = "rw" diff --git a/terraso_backend/tests/graphql/test_shared_data.py b/terraso_backend/tests/graphql/test_shared_data.py index 5add53eb1..9d0de8250 100644 --- a/terraso_backend/tests/graphql/test_shared_data.py +++ b/terraso_backend/tests/graphql/test_shared_data.py @@ -29,6 +29,8 @@ from ..core.gis.test_parsers import KML_TEST_FILES +gpd.options.io_engine = "fiona" + pytestmark = pytest.mark.django_db