Skip to content

Commit cca65cf

Browse files
increase consistency, add comments in env_climada.yml
1 parent 4ead073 commit cca65cf

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ dependencies = [
2828
"contextily",
2929
"dask",
3030
"deprecation",
31+
"fiona",
32+
"gdal",
3133
"geopandas",
3234
"h5py",
3335
"haversine",
@@ -41,14 +43,15 @@ dependencies = [
4143
"peewee",
4244
"pillow",
4345
"pint",
46+
"pyarrow",
4447
"pycountry",
4548
"pyproj",
4649
"rasterio",
4750
"salib",
4851
"scikit-learn",
4952
"seaborn",
50-
"statsmodels",
5153
"sparse",
54+
"statsmodels",
5255
"tables",
5356
"tabulate",
5457
"tqdm",

requirements/env_climada.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,36 @@ dependencies:
1111
- dask>=2025.5
1212
- deprecation>=2.1
1313
- eccodes>=2.41
14+
- fiona>=1.10
1415
- gdal>=3.10
15-
- geopandas>=0.14,<1.0 # geopandas 1.0 does not depend on fiona anymore, hence fiona would need to be added as dependency
16+
- geopandas>=0.14,<1.0 # not yet ready for upgrading
1617
- h5py>=3.13
1718
- haversine>=2.9
1819
- matplotlib-base>=3.10
1920
- netcdf4>=1.7
2021
- numba>=0.61
2122
- numexpr>=2.10
2223
- openpyxl>=3.1
23-
- osm-flex>=1.1
24+
- osm-flex>=1.1 # this is only required for running the tutorials, not for the CLIMADA package itself
2425
- overpy>=0.7
2526
- pandas>=2.1,<2.2 # 2.2 is not compatible with the default pytables=3.7 and yields a very high deprecation warning number through geopandas
2627
- pathos>=0.3
2728
- peewee>=3.17
2829
- pint>=0.24
2930
- pip
31+
- pyarrow>=20.0 # this is needed by dask from conda-forge but not from pypi
3032
- pycountry>=24.6
3133
- pyproj>=3.7
32-
- pytables>=3.10
34+
- pytables>=3.10 # this is the name of the pypi 'tables' package on conda-forge
3335
- python>=3.10,<3.13
3436
- pyxlsb>=1.0
3537
- rasterio>=1.4
3638
- requests>=2.32
37-
- rtree>=1.3,<1.4 # needed by geopandas, 1.4.0 doesn't pass the `pip check`
39+
- rtree>=1.3,<1.4 # 1.4.0 doesn't pass the `pip check`, needed by geopandas
3840
- salib>=1.5
39-
- seaborn>=0.13
4041
- scikit-learn>=1.7
4142
- scipy>=1.14,<1.15 # 1.15 is not compatible with climada_petals, climada_petals.engine.test.test_supplychain fails with "'Series' has no attribute 'nonzero'"
43+
- seaborn>=0.13
4244
- sparse>=0.17
4345
- statsmodels>=0.14
4446
- tabulate>=0.9

0 commit comments

Comments
 (0)