From 64885c5c7782a7fb50265067c09df6ad108d8e58 Mon Sep 17 00:00:00 2001 From: "Matthew T. Perry" Date: Fri, 27 Sep 2024 11:11:06 -0600 Subject: [PATCH 1/3] catch ValueError too --- src/rasterstats/io.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/rasterstats/io.py b/src/rasterstats/io.py index e74d369..3f9123b 100644 --- a/src/rasterstats/io.py +++ b/src/rasterstats/io.py @@ -97,7 +97,14 @@ def read_features(obj, layer=0): assert len(src) > 0 features_iter = fiona_generator(obj, layer) - except (AssertionError, TypeError, OSError, DriverError, UnicodeDecodeError): + except ( + AssertionError, + DriverError, + OSError, + TypeError, + UnicodeDecodeError, + ValueError, + ): try: mapping = json.loads(obj) if "type" in mapping and mapping["type"] == "FeatureCollection": From 05c98d535f9b445337f14f57937b78cb08632eb3 Mon Sep 17 00:00:00 2001 From: "Matthew T. Perry" Date: Fri, 27 Sep 2024 11:21:55 -0600 Subject: [PATCH 2/3] pin geopandas --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 595ef97..878e52f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ progress = [ ] test = [ "coverage", - "geopandas", + "geopandas <= 1.0", "pyshp >=1.1.4", "pytest >=4.6", "pytest-cov >=2.2.0", From 2fc300f5530056ce62ed4577b7dd2e37f9648ad5 Mon Sep 17 00:00:00 2001 From: "Matthew T. Perry" Date: Fri, 27 Sep 2024 11:29:04 -0600 Subject: [PATCH 3/3] bump minimum python to 3.9 --- .github/workflows/test-rasterstats.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-rasterstats.yml b/.github/workflows/test-rasterstats.yml index e3f4081..bc979fe 100644 --- a/.github/workflows/test-rasterstats.yml +++ b/.github/workflows/test-rasterstats.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index 878e52f..595ef97 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ progress = [ ] test = [ "coverage", - "geopandas <= 1.0", + "geopandas", "pyshp >=1.1.4", "pytest >=4.6", "pytest-cov >=2.2.0",