Skip to content

require python 3.10 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinfleis merged 3 commits into from
Feb 1, 2025
Merged

require python 3.10 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97cbef4
require python 3.10
martinfleis Feb 1, 2025
fb8586a
exactextract from pypi on win
martinfleis Feb 1, 2025
395cb2e
ee
martinfleis Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions ci/312.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies:
- rioxarray
- joblib
- rasterio
- exactextract
- tqdm
- pyproj
# testing
Expand All @@ -20,8 +21,5 @@ dependencies:
- geodatasets
- pyogrio
- mypy
- pip
- pip:
- exactextract


8 changes: 5 additions & 3 deletions ci/39.yaml → ci/313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,4 +18,7 @@ dependencies:
- pytest-reportlog
- geopandas-base
- geodatasets
- pyogrio
- pyogrio
- pip
- pip:
- exactextract
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions xvec/accessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions xvec/zonal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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],
Expand Down