avoid circular imports

Author: emanuel-schmid

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,

setup.py

@@ -24,7 +24,7 @@
 DEPS_TEST = [
     "ipython",
     "mccabe>=0.6",
-    "pylint==2.7.1",
+    "pylint>=3.0",
     "pytest",
     "pytest-cov",
     "pytest-subtests",