Skip to content

Commit 07d757c

Browse files
committed
resolve conflicts w/main
2 parents 2fbabe3 + 4a43e01 commit 07d757c

File tree

4 files changed

+44
-12
lines changed

4 files changed

+44
-12
lines changed

.github/workflows/unittests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
matrix:
2626
os: [ubuntu-latest]
2727
environment-file: [
28+
ci/311-oldest.yml,
2829
ci/311.yml,
2930
ci/312.yml,
3031
ci/313.yml,

ci/311-oldest.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.11
6+
- jupyterlab
7+
- dask
8+
- dask-geopandas
9+
- numpy=2.0
10+
- geopandas=1.0
11+
- pandas=2.2
12+
- numpy
13+
- rasterio=1.4
14+
- rasterstats=0.20
15+
- statsmodels=0.14
16+
- scikit-learn
17+
- scipy=1.13
18+
- libpysal=4.10
19+
- tqdm=4.67
20+
- codecov
21+
- pytest
22+
- pytest-mpl
23+
- pytest-cov
24+
- pytest-xdist
25+
- coverage
26+
- twine
27+
- pip
28+
- h3-py
29+
- joblib=1.4
30+
- astropy
31+
- mapclassify

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- dask
77
- jupyterlab
88
- numpy
9-
- geopandas >=0.13
9+
- geopandas
1010
- pandas
1111
- numpy
1212
- rasterio

pyproject.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ classifiers = [
2828
"Intended Audience :: Science/Research",
2929
"Topic :: Scientific/Engineering :: GIS",
3030
]
31-
requires-python = ">=3.9"
31+
requires-python = ">=3.11"
3232
dependencies = [
33-
"numpy",
34-
"pandas",
35-
"geopandas >=0.13",
36-
"rasterio",
37-
"scipy",
38-
"statsmodels",
39-
"rasterstats",
40-
"libpysal",
41-
"tqdm",
42-
"joblib"
33+
"geopandas>=1.0",
34+
"joblib>=1.4",
35+
"libpysal>=4.10",
36+
"numpy>=2.0",
37+
"pandas>=2.2",
38+
"rasterio>=1.4",
39+
"rasterstats>=0.20",
40+
"scipy>=1.13",
41+
"statsmodels>=0.14",
42+
"tqdm>=4.67",
4343
]
4444

4545
[project.urls]

0 commit comments

Comments
 (0)