CI: test on Py3.9+ (#33)

* CI: test on Py3.9+

* compat with py39+

* make ruff happy

Author: martinfleis

.github/workflows/tests.yaml

@@ -19,6 +19,10 @@ jobs:
         os: [macos-latest, ubuntu-latest, windows-latest]
         environment-file: [ci/latest.yaml]
         include:
+          - environment-file: ci/39.yaml
+            os: ubuntu-latest
+          - environment-file: ci/310.yaml
+            os: ubuntu-latest
           - environment-file: ci/dev.yaml
             os: ubuntu-latest
     defaults:

ci/310.yaml

@@ -0,0 +1,15 @@
+name: xvec
+channels:
+  - conda-forge
+dependencies:
+  - python=3.10
+  # required
+  - shapely=2
+  - xarray
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  - pytest-xdist
+  - pytest-reportlog
+  - geopandas-base

ci/39.yaml

@@ -0,0 +1,15 @@
+name: xvec
+channels:
+  - conda-forge
+dependencies:
+  - python=3.9
+  # required
+  - shapely=2
+  - xarray
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  - pytest-xdist
+  - pytest-reportlog
+  - geopandas-base

ci/dev.yaml

@@ -1,7 +1,6 @@
 name: xvec_dev
 channels:
   - conda-forge
-  - conda-forge/label/shapely_dev
 dependencies:
   - python
   # to build from source

ci/latest.yaml

@@ -1,7 +1,6 @@
 name: xvec
 channels:
   - conda-forge
-  - conda-forge/label/shapely_dev
 dependencies:
   - python
   # required

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Topic :: Scientific/Engineering :: GIS",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
     "xarray >= 2022.12.0",
     "pyproj >= 3.0.0",
@@ -55,4 +55,4 @@ exclude_lines = [
 line-length = 88
 select = ["E", "F", "W", "I", "UP", "B", "A", "C4", "Q"]
 exclude = ["doc"]
-target-version = "py38"
+target-version = "py39"

xvec/accessor.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import warnings
-from typing import Any, Hashable, Mapping, Sequence, Union
+from collections.abc import Hashable, Mapping, Sequence
+from typing import Any
 
 import numpy as np
 import pandas as pd
@@ -18,7 +21,7 @@ class XvecAccessor:
     Currently works on coordinates with :class:`xvec.GeometryIndex`.
     """
 
-    def __init__(self, xarray_obj: Union[xr.Dataset, xr.DataArray]):
+    def __init__(self, xarray_obj: xr.Dataset | xr.DataArray):
         """xvec init, nothing to be done here."""
         self._obj = xarray_obj
         self._geom_coords_all = [

xvec/index.py

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