Merge branch 'develop-white' into feature/restructure_fitfuncs_exceedance

Author: ValentinGebhart

.gitignore

@@ -176,3 +176,10 @@ data/ISIMIP_crop/
 
 # climada data results folder:
 results/
+
+# Hidden files we want to track
+!.gitignore
+!.pre-commit-config.yaml
+!.pylintrc
+!.readthedocs.yml
+!.github

.pre-commit-config.yaml

@@ -0,0 +1,23 @@
+# See https://pre-commit.com for more information
+default_language_version:
+  python: python3
+
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/pycqa/isort
+    rev: '5.13.2'
+    hooks:
+      - id: isort
+        args: ["--profile", "black", "--filter-files"]
+
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: '24.4.2'
+    hooks:
+      - id: black-jupyter

CHANGELOG.md

@@ -17,6 +17,7 @@ Code freeze date: YYYY-MM-DD
 
 ### Changed
 
+- Improved scaling factors implemented in `climada.hazard.trop_cyclone.apply_climate_scenario_knu` to model the impact of climate changes to tropical cyclones [#734](https://github.com/CLIMADA-project/climada_python/pull/734)
 - In `climada.util.plot.geo_im_from_array`, NaNs are plotted in gray while cells with no centroid are not plotted [#929](https://github.com/CLIMADA-project/climada_python/pull/929)
 - Renamed `climada.util.plot.subplots_from_gdf` to `climada.util.plot.plot_from_gdf` [#929](https://github.com/CLIMADA-project/climada_python/pull/929)
 - `Hazard.local_exceedance_inten`, `Hazard.local_return_period`, and `Impact.local_exceedance_imp` call the corresponding new functions and a deprecation warning is added [#918](https://github.com/CLIMADA-project/climada_python/pull/918). Some inconsistencies in the previous versions are removed and the default method is changed. To reconstruct results from the previous versions, use CLIMADA v5.0.0 or less.

climada/engine/cost_benefit.py

@@ -32,7 +32,7 @@
 from tabulate import tabulate
 
 from climada.engine.impact_calc import ImpactCalc
-from climada.engine import Impact, ImpactFreqCurve
+from climada.engine.impact import Impact, ImpactFreqCurve
 
 LOGGER = logging.getLogger(__name__)
 

climada/engine/impact_calc.py

@@ -27,7 +27,7 @@
 import geopandas as gpd
 
 from climada import CONFIG
-from climada.engine import Impact
+from climada.engine.impact import Impact
 
 LOGGER = logging.getLogger(__name__)
 

climada/engine/unsequa/calc_base.py

@@ -29,7 +29,7 @@
 import numpy as np
 
 from climada.util.value_representation import sig_dig as u_sig_dig
-from climada.engine.unsequa import UncOutput
+from climada.engine.unsequa.unc_output import UncOutput
 
 LOGGER = logging.getLogger(__name__)
 

climada/engine/unsequa/calc_cost_benefit.py

@@ -27,14 +27,14 @@
 
 from typing import Optional, Union
 import pandas as pd
-import numpy as np
 import pathos.multiprocessing as mp
 # use pathos.multiprocess fork of multiprocessing for compatibility
 # wiht notebooks and other environments https://stackoverflow.com/a/65001152/12454103
 
 from climada.engine.cost_benefit import CostBenefit
-from climada.engine.unsequa import Calc, InputVar, UncCostBenefitOutput
-from climada.engine.unsequa.calc_base import _sample_parallel_iterator, _multiprocess_chunksize, _transpose_chunked_data
+from climada.engine.unsequa.input_var import InputVar
+from climada.engine.unsequa.unc_output import UncCostBenefitOutput
+from climada.engine.unsequa.calc_base import Calc, _sample_parallel_iterator, _multiprocess_chunksize, _transpose_chunked_data
 from climada.util import log_level
 from climada.hazard import Hazard
 from climada.entity import Entity

climada/engine/unsequa/calc_delta_climate.py

@@ -34,8 +34,10 @@
 # wiht notebooks and other environments https://stackoverflow.com/a/65001152/12454103
 
 from climada.engine import ImpactCalc
-from climada.engine.unsequa import Calc, InputVar, UncImpactOutput
+from climada.engine.unsequa.input_var import InputVar
+from climada.engine.unsequa.unc_output import UncImpactOutput
 from climada.engine.unsequa.calc_base import (
+    Calc,
     _sample_parallel_iterator,
     _multiprocess_chunksize,
     _transpose_chunked_data,

climada/engine/unsequa/calc_impact.py

@@ -33,8 +33,10 @@
 # wiht notebooks and other environments https://stackoverflow.com/a/65001152/12454103
 
 from climada.engine import ImpactCalc
-from climada.engine.unsequa import Calc, InputVar, UncImpactOutput
+from climada.engine.unsequa.input_var import InputVar
+from climada.engine.unsequa.unc_output import UncImpactOutput
 from climada.engine.unsequa.calc_base import (
+    Calc,
     _sample_parallel_iterator,
     _multiprocess_chunksize,
     _transpose_chunked_data,