require python 3.10 (#94)

* require python 3.10

* exactextract from pypi on win

* ee

Author: martinfleis

.github/workflows/tests.yaml

@@ -17,14 +17,14 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        environment-file: [ci/312.yaml]
+        environment-file: [ci/313.yaml]
         include:
-          - environment-file: ci/39.yaml
-            os: ubuntu-latest
           - environment-file: ci/310.yaml
             os: ubuntu-latest
           - environment-file: ci/311.yaml
             os: ubuntu-latest
+          - environment-file: ci/312.yaml
+            os: ubuntu-latest
           - environment-file: ci/dev.yaml
             os: ubuntu-latest
     defaults:

ci/312.yaml

@@ -9,6 +9,7 @@ dependencies:
   - rioxarray
   - joblib
   - rasterio
+  - exactextract
   - tqdm
   - pyproj
   # testing
@@ -20,8 +21,5 @@ dependencies:
   - geodatasets
   - pyogrio
   - mypy
-  - pip
-  - pip:
-    - exactextract
 
 

ci/39.yaml renamed to ci/313.yaml

@@ -2,14 +2,13 @@ name: xvec
 channels:
   - conda-forge
 dependencies:
-  - python=3.9
+  - python=3.13
   # required
   - shapely >=2
   - xarray
   - rioxarray
   - joblib
   - rasterio
-  - exactextract
   - tqdm
   - pyproj
   # testing
@@ -19,4 +18,7 @@ dependencies:
   - pytest-reportlog
   - geopandas-base
   - geodatasets
-  - pyogrio
+  - pyogrio
+  - pip
+  - pip:
+    - exactextract

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Topic :: Scientific/Engineering :: GIS",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "xarray >= 2022.12.0",
     "pyproj >= 3.0.0",

xvec/accessor.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import warnings
-from collections.abc import Hashable, Mapping, Sequence
-from typing import TYPE_CHECKING, Any, Callable, cast
+from collections.abc import Callable, Hashable, Mapping, Sequence
+from typing import TYPE_CHECKING, Any, cast
 
 import numpy as np
 import pandas as pd

xvec/zonal.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import gc
-from collections.abc import Hashable, Iterable, Sequence
-from typing import Any, Callable
+from collections.abc import Callable, Hashable, Iterable, Sequence
+from typing import Any
 
 import numpy as np
 import pandas as pd
@@ -52,7 +52,7 @@ def _zonal_stats_rasterize(
     transform = acc._obj.rio.transform()
 
     labels = features.rasterize(
-        zip(geometry, range(len(geometry))),
+        zip(geometry, range(len(geometry)), strict=False),
         out_shape=(
             acc._obj[y_coords].shape[0],
             acc._obj[x_coords].shape[0],