propagates name change

Author: spjuhel

climada/entity/measures/measure_config.py

@@ -448,7 +448,7 @@ class MeasureConfig(ModifierConfig):
 
     This class is the primary entry point for defining measures in a
     declarative, file-based workflow and serves as the serialization
-    counterpart to :class:`~climada.entity.measures.base.Measure`.
+    counterpart to :class:`~climada.entity.measures.measure.Measure`.
 
     Parameters
     ----------

climada/entity/measures/test/test_base.py …ada/entity/measures/test/test_measure.pyclimada/entity/measures/test/test_base.py renamed to climada/entity/measures/test/test_measure.py climada/entity/measures/test/test_base.py renamed to climada/entity/measures/test/test_measure.py

@@ -24,8 +24,8 @@
 
 import pytest
 
-from climada.entity.measures.base import Measure, allow_kwargs
 from climada.entity.measures.cost_income import CostIncome
+from climada.entity.measures.measure import Measure, allow_kwargs
 
 
 def _make_mock():
@@ -149,7 +149,7 @@ def fn(obj, **kw):
             return obj
 
         with patch(
-            "climada.entity.measures.base.copy.deepcopy", return_value=copied
+            "climada.entity.measures.measure.copy.deepcopy", return_value=copied
         ) as mock_dc:
             m = Measure("test", exposures_changes=fn)
             result = m.apply_exposures_changes(original, enforce_copy=True)
@@ -162,7 +162,7 @@ def test_no_deepcopy_when_enforce_copy_false(self):
         def fn(obj, **kw):
             return obj
 
-        with patch("climada.entity.measures.base.copy.deepcopy") as mock_dc:
+        with patch("climada.entity.measures.measure.copy.deepcopy") as mock_dc:
             m = Measure("test", exposures_changes=fn)
             m.apply_exposures_changes(original, enforce_copy=False)
             mock_dc.assert_not_called()
@@ -201,7 +201,9 @@ def test_custom_fn_deepcopies_when_enforce_copy(self):
         def fn(obj, **kw):
             return obj
 
-        with patch("climada.entity.measures.base.copy.deepcopy", return_value=copied):
+        with patch(
+            "climada.entity.measures.measure.copy.deepcopy", return_value=copied
+        ):
             m = Measure("test", impfset_changes=fn)
             result = m.apply_impfset_changes(_make_mock(), enforce_copy=True)
             assert result is copied
@@ -239,7 +241,9 @@ def test_custom_fn_deepcopies_when_enforce_copy(self):
         def fn(obj, **kw):
             return obj
 
-        with patch("climada.entity.measures.base.copy.deepcopy", return_value=copied):
+        with patch(
+            "climada.entity.measures.measure.copy.deepcopy", return_value=copied
+        ):
             m = Measure("test", hazard_changes=fn)
             result = m.apply_hazard_changes(_make_mock(), enforce_copy=True)
             assert result is copied
@@ -248,7 +252,7 @@ def test_no_deepcopy_when_enforce_copy_false(self):
         def fn(obj, **kw):
             return obj
 
-        with patch("climada.entity.measures.base.copy.deepcopy") as mock_dc:
+        with patch("climada.entity.measures.measure.copy.deepcopy") as mock_dc:
             m = Measure("test", hazard_changes=fn)
             m.apply_hazard_changes(_make_mock(), enforce_copy=False)
             mock_dc.assert_not_called()

climada/test/test_measures.py

@@ -17,8 +17,8 @@
 import pytest
 from scipy.sparse import csr_matrix
 
-from climada.entity.measures.base import Measure
 from climada.entity.measures.cost_income import CostIncome
+from climada.entity.measures.measure import Measure
 from climada.test.conftest import HAZARD_TYPE
 
 # ===========================================================================

doc/api/climada/climada.entity.measures.rst

@@ -8,7 +8,7 @@ climada\.entity\.measures package
 climada\.entity\.measures\.base module
 --------------------------------------
 
-.. automodule:: climada.entity.measures.base
+.. automodule:: climada.entity.measures.measure
     :members:
     :undoc-members:
     :show-inheritance: