undo

Author: emanuel-schmid

.github/scripts/prepare_release.py

@@ -111,7 +111,7 @@ def update_changelog(nvn):
                             if "release date: " in line.lower():
                                 today = time.strftime("%Y-%m-%d")
                                 lines[i] = f"Release date: {today}"
-                    changelog.write(re.sub("\n+$", "\n", "\n".join(lines)))
+                    changelog.write("\n".join(lines).replace("\n\n", "\n"))
                     changelog.write("\n")
     return GitFile('CHANGELOG.md')
 

CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## 4.3.3
+## Unreleased
 
-Release date: 2023-09-01
+Release date: YYYY-MM-DD
+
+Code freeze date: YYYY-MM-DD
 
 ### Dependency Updates
 
@@ -61,7 +63,7 @@ Removed:
 - 'Extra' requirements `doc`, `test`, and `dev` for Python package [#712](https://github.com/CLIMADA-project/climada_python/pull/712)
 - Added method `Exposures.centroids_total_value` to replace the functionality of `Exposures.affected_total_value`. This method is temporary and deprecated. [#702](https://github.com/CLIMADA-project/climada_python/pull/702)
 - New method `climada.util.api_client.Client.purge_cache`: utility function to remove outdated files from the local file system to free disk space.
-([#737](https://github.com/CLIMADA-project/climada_python/pull/737))
+  ([#737](https://github.com/CLIMADA-project/climada_python/pull/737))
 - New attribute `climada.hazard.Hazard.haz_type`: used for assigning impacts to hazards. In previous versions this information was stored in the now removed `climada.hazard.tag.Tag` class. [#736](https://github.com/CLIMADA-project/climada_python/pull/736)
 - New attribute `climada.entity.exposures.Exposures.description`: used for setting the default title in plots from plotting mathods `plot_hexbin` and `plot_scatter`. In previous versions this information was stored in the deprecated `climada.entity.tag.Tag` class. [#756](https://github.com/CLIMADA-project/climada_python/pull/756)
 - Added advanced examples in unsequa tutorial for coupled input variables and for handling efficiently the loading of multiple large files [#766](https://github.com/CLIMADA-project/climada_python/pull/766)
@@ -117,14 +119,14 @@ Removed:
 - `Centroids.set_raster_from_pix_bounds` [#721](https://github.com/CLIMADA-project/climada_python/pull/721)
 - `requirements/env_developer.yml` environment specs. Use 'extra' requirements when installing the Python package instead [#712](https://github.com/CLIMADA-project/climada_python/pull/712)
 - The `climada.entitity.tag.Tag` class, together with `Impact.tag`, `Exposures.tag`, `ImpactFuncSet.tag`, `MeasuresSet.tag`, `Hazard.tag` attributes.
-This may break backwards-compatibility with respect to the files written and read by the `Impact` class.
-[#736](https://github.com/CLIMADA-project/climada_python/pull/736),
-[#743](https://github.com/CLIMADA-project/climada_python/pull/743),
-[#753](https://github.com/CLIMADA-project/climada_python/pull/753),
-[#754](https://github.com/CLIMADA-project/climada_python/pull/754),
-[#756](https://github.com/CLIMADA-project/climada_python/pull/756),
-[#767](https://github.com/CLIMADA-project/climada_python/pull/767),
-[#779](https://github.com/CLIMADA-project/climada_python/pull/779)
+  This may break backwards-compatibility with respect to the files written and read by the `Impact` class.
+  [#736](https://github.com/CLIMADA-project/climada_python/pull/736),
+  [#743](https://github.com/CLIMADA-project/climada_python/pull/743),
+  [#753](https://github.com/CLIMADA-project/climada_python/pull/753),
+  [#754](https://github.com/CLIMADA-project/climada_python/pull/754),
+  [#756](https://github.com/CLIMADA-project/climada_python/pull/756),
+  [#767](https://github.com/CLIMADA-project/climada_python/pull/767),
+  [#779](https://github.com/CLIMADA-project/climada_python/pull/779)
 - `impact.tot_value` attribute removed from unsequa module [#763](https://github.com/CLIMADA-project/climada_python/pull/763)
 
 ## v3.3.2
@@ -153,6 +155,10 @@ Patch-relaese with altered base config file so that the basic installation test
 
 Release date: 2023-02-17
 
+Code freeze date: 2023-02-05
+
+### Description
+
 ### Dependency Changes
 
 new:
@@ -242,3 +248,4 @@ updated:
 - `climada.enginge.impact.Impact.calc()` and `climada.enginge.impact.Impact.calc_impact_yearset()`
 [#436](https://github.com/CLIMADA-project/climada_python/pull/436).
 
+### Removed

climada/_version.py

@@ -1 +1 @@
-__version__ = '4.3.3'
+__version__ = '3.3.2-dev'

doc/misc/README.md

@@ -15,13 +15,7 @@ This is the Python (3.8+) version of CLIMADA - please see https://github.com/dav
 
 ## Getting started
 
-CLIMADA runs on Windows, macOS and Linux.
-The released versions of the CLIMADA core can be installed directly through Anaconda:
-```shell
-conda install -c conda-forge climada
-```
-It is **highly recommended** to install CLIMADA into a **separate** Anaconda environment.
-See the [installation guide](https://climada-python.readthedocs.io/en/latest/guide/install.html) for further information.
+CLIMADA runs on Windows, macOS and Linux. It can be installed from sources or - in case of climada_python - directly with pip. See the [installation guide](https://climada-python.readthedocs.io/en/latest/guide/install.html) for instructions.
 
 Follow the [tutorial](https://climada-python.readthedocs.io/en/latest/tutorial/1_main_climada.html) `climada_python-x.y.z/doc/tutorial/1_main_climada.ipynb` in a Jupyter Notebook to see what can be done with CLIMADA and how.
 

setup.py

@@ -33,7 +33,7 @@
 setup(
     name='climada',
 
-    version='4.3.3',
+    version='3.3.2-dev',
 
     description='CLIMADA in Python',