circular imports: re-establish measures, tag and disc_rates import through entity

by importing Impact in measures strictly on method level

Author: schmide

climada/engine/impact.py

@@ -37,10 +37,9 @@
 from tqdm import tqdm
 
 
-from climada.entity.tag import Tag
-from climada.entity.exposures.base import Exposures
-from climada.hazard.tag import Tag as TagHaz
-from climada.entity.exposures.base import INDICATOR_IF, INDICATOR_CENTR
+from climada.entity import Exposures, Tag
+from climada.entity.exposures import INDICATOR_IF, INDICATOR_CENTR
+from climada.hazard import Tag as TagHaz
 import climada.util.plot as u_plot
 from climada import CONFIG
 from climada.util.constants import DEF_CRS

climada/entity/__init__.py

@@ -20,3 +20,6 @@
 """
 from .exposures import *
 from .impact_funcs import *
+from .tag import *
+from .disc_rates import *
+from .measures import *

climada/entity/exposures/base.py

@@ -19,7 +19,7 @@
 Define Exposures class.
 """
 
-__all__ = ['Exposures', 'add_sea']
+__all__ = ['Exposures', 'add_sea', 'INDICATOR_IF', 'INDICATOR_CENTR']
 
 import logging
 import copy

climada/entity/exposures/litpop.py

@@ -15,6 +15,9 @@
 You should have received a copy of the GNU Lesser General Public License along
 with CLIMADA. If not, see <https://www.gnu.org/licenses/>.
 """
+
+__all__ = ['LitPop']
+
 import logging
 import time
 from sys import stdout

climada/entity/measures/base.py

@@ -29,7 +29,6 @@
 from geopandas import GeoDataFrame
 
 from climada.entity.exposures.base import Exposures, INDICATOR_IF, INDICATOR_CENTR
-from climada.engine.impact import Impact
 import climada.util.checker as u_check
 
 LOGGER = logging.getLogger(__name__)
@@ -294,6 +293,7 @@ def _cutoff_hazard_damage(self, exposures, if_set, hazard):
         else:
             exp_imp = exposures
 
+        from climada.engine.impact import Impact
         imp = Impact()
         imp.calc(exp_imp, if_set, hazard)