Skip to content

Commit 160fa52

Browse files
Update environment specs (#845)
* Update environment specs * Set 'nodefaults' because conda-forge is incompatible with Anaconda default channels. * Set 'pyproj' requirement instead of 'proj'. * Drop minimum pyproj requirement to v3.5 v3.6 conflicts with gdal because of proj requirements. * Update CHANGELOG.md * dependencies: sneak in minimal versions for pyarrow and numexpr --------- Co-authored-by: emanuel-schmid <[email protected]>
1 parent d022094 commit 160fa52

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ Code freeze date: YYYY-MM-DD
1010

1111
### Dependency Changes
1212

13+
Added:
14+
15+
- `pyproj` >=3.5
16+
- `pyarrow` >=14.0
17+
- `numexpr` >=2.8
18+
19+
Removed:
20+
21+
- `proj` (in favor of `pyproj`)
22+
1323
### Added
1424

1525
- Convenience method `api_client.Client.get_dataset_file`, combining `get_dataset_info` and `download_dataset`, returning a single file objet. [#821](https://github.com/CLIMADA-project/climada_python/pull/821)
@@ -24,6 +34,7 @@ Code freeze date: YYYY-MM-DD
2434
- Recommend using Mamba instead of Conda for installing CLIMADA [#809](https://github.com/CLIMADA-project/climada_python/pull/809)
2535
- `Hazard.from_xarray_raster` now allows arbitrary values as 'event' coordinates [#837](https://github.com/CLIMADA-project/climada_python/pull/837)
2636
- `climada.test.get_test_file` now compares the version of the requested test dataset with the version of climada itself and selects the most appropriate dataset. In this way a test file can be updated without the need of changing the code of the unittest. [#822](https://github.com/CLIMADA-project/climada_python/pull/822)
37+
- Explicitly require `pyproj` instead of `proj` (the latter is now implicitly required) [#845](https://github.com/CLIMADA-project/climada_python/pull/845)
2738

2839
### Fixed
2940

@@ -32,6 +43,7 @@ Code freeze date: YYYY-MM-DD
3243
- `climada.util.yearsets.sample_from_poisson`: fix a bug ([#819](https://github.com/CLIMADA-project/climada_python/issues/819)) and inconsistency that occurs when lambda events per year (`lam`) are set to 1. [[#823](https://github.com/CLIMADA-project/climada_python/pull/823)]
3344
- In the TropCyclone class in the Holland model 2008 and 2010 implementation, a doublecounting of translational velocity is removed [#833](https://github.com/CLIMADA-project/climada_python/pull/833)
3445
- `climada.util.test.test_finance` and `climada.test.test_engine` updated to recent input data from worldbank [#841](https://github.com/CLIMADA-project/climada_python/pull/841)
46+
- Set `nodefaults` in Conda environment specs because `defaults` are not compatible with conda-forge [#845](https://github.com/CLIMADA-project/climada_python/pull/845)
3547

3648
### Deprecated
3749

requirements/env_climada.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: climada_env
22
channels:
33
- conda-forge
4-
- defaults
4+
- nodefaults
55
dependencies:
66
- bottleneck>=1.3
77
- cartopy>=0.22
@@ -16,15 +16,17 @@ dependencies:
1616
- matplotlib-base>=3.8
1717
- netcdf4>=1.6
1818
- numba>=0.58
19+
- numexpr>=2.8
1920
- openpyxl>=3.1
2021
- 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
2122
- pandas-datareader>=0.10
2223
- pathos>=0.3
2324
- pint>=0.22
2425
- pip
25-
- proj>=9.1
26+
- pyarrow>=14.0
2627
- pycountry>=22.3
2728
- pyepsg>=0.4
29+
- pyproj>=3.5
2830
- pytables>=3.7
2931
- pyxlsb>=1.0
3032
- rasterio>=1.3

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
'pillow',
8282
'pint',
8383
'pycountry',
84+
'pyproj',
8485
'rasterio',
8586
'salib',
8687
'scikit-learn',

0 commit comments

Comments
 (0)