Merge branch 'develop' into feature/centroids_as_gdf

CLIMADA-project · Sep 28, 2023 · 4119f33 · 4119f33
2 parents fb374d3 + 1dae5a7
commit 4119f33
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,33 @@ Removed:
 
 ### Changed
 
+### Fixed
+
+### Deprecated
+
+### Removed
+
+## 4.0.1
+
+Release date: 2023-09-27
+
+### Dependency Changes
+
+Added:
+
+- `matplotlib-base` None &rarr; >=3.8
+
+Changed:
+
+- `geopandas` >=0.13 &rarr; >=0.14
+- `pandas` >=1.5,<2.0 &rarr; >=2.1
+
+Removed:
+
+- `matplotlib` >=3.7
+
+### Changed
+
 - Rearranged file-system structure: `data` directory moved into `climada` package directory. [#781](https://github.com/CLIMADA-project/climada_python/pull/781)
 
 ### Fixed

diff --git a/climada/_version.py b/climada/_version.py
@@ -1 +1 @@
-__version__ = '4.0.1'
+__version__ = '4.0.2-dev'
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
 setup(
     name='climada',
 
-    version='4.0.1',
+    version='4.0.2-dev',
 
     description='CLIMADA in Python',