Roll back addition of sample_size parameters in DL_calculation.py

And linting.

pelicun/base.py

@@ -441,7 +441,7 @@ def emit_warnings(self):
         """
         for message in self.warning_stack:
             if message not in self.emitted:
-                warnings.warn(message, PelicunWarning)
+                warnings.warn(message, PelicunWarning, stacklevel=2)
                 if self.warning_file is not None:
                     with open(self.warning_file, 'a', encoding='utf-8') as f:
                         f.write(

pelicun/model/damage_model.py

@@ -240,7 +240,6 @@ def load_model_parameters(self, data_paths, cmp_set, warn_missing=False):
 
     def calculate(
         self,
-        sample_size=None,
         dmg_process=None,
         block_batch_size=1000,
         scaling_specification=None,

pelicun/model/loss_model.py

@@ -360,7 +360,7 @@ def load_model_parameters(self, data_paths, decision_variables=None):
         )
         self._ensure_loss_parameter_availability()
 
-    def calculate(self, sample_size=None):
+    def calculate(self):
         """
         Calculate the loss of each component block.
 
@@ -596,6 +596,11 @@ def save_sample(self, filepath=None, save_units=False):
 
         Saves the sample of the `ds_model`.
 
+        Returns
+        -------
+        tuple
+            The output of {loss model}.ds_model.save_sample.
+
         """
         self.log.warn(
             '`{loss model}.save_sample` is deprecated and will raise '
@@ -1194,7 +1199,7 @@ def save_sample(self, filepath=None, save_units=False):
             If no `filepath` is specified, returns:
             * DataFrame containing the loss sample.
             * Optionally, a Series containing the units for each
-              column if `save_units` is True.
+            column if `save_units` is True.
 
         Raises
         ------

pelicun/tests/basic/test_asset_model.py

@@ -220,15 +220,17 @@ def test_load_cmp_model_csv(self, asset_model):
 
     def test_load_cmp_model_exceptions(self, asset_model):
         cmp_marginals = pd.read_csv(
-            'pelicun/tests/basic/data/model/test_AssetModel/CMP_marginals_invalid_loc.csv',
+            'pelicun/tests/basic/data/model/test_AssetModel/'
+            'CMP_marginals_invalid_loc.csv',
             index_col=0,
         )
         asset_model._asmnt.stories = 4
         with pytest.raises(ValueError):
             asset_model.load_cmp_model({'marginals': cmp_marginals})
 
         cmp_marginals = pd.read_csv(
-            'pelicun/tests/basic/data/model/test_AssetModel/CMP_marginals_invalid_dir.csv',
+            'pelicun/tests/basic/data/model/test_AssetModel/'
+            'CMP_marginals_invalid_dir.csv',
             index_col=0,
         )
         asset_model._asmnt.stories = 4

pelicun/tests/basic/test_base.py

@@ -856,18 +856,24 @@ def test_parse_units():
 
     # Test that an exception is raised if a unit is defined twice in
     # the additional units file
-    duplicate_units_file = 'pelicun/tests/basic/data/base/test_parse_units/duplicate2.json'
+    duplicate_units_file = (
+        'pelicun/tests/basic/data/base/test_parse_units/duplicate2.json'
+    )
     with pytest.raises(ValueError):
         units = base.parse_units(duplicate_units_file)
 
     # Test that an exception is raised if a unit conversion factor is not a float
-    invalid_units_file = 'pelicun/tests/basic/data/base/test_parse_units/not_float.json'
+    invalid_units_file = (
+        'pelicun/tests/basic/data/base/test_parse_units/not_float.json'
+    )
     with pytest.raises(TypeError):
         units = base.parse_units(invalid_units_file)
 
     # Test that we get an error if some first-level key does not point
     # to a dictionary
-    invalid_units_file = 'pelicun/tests/basic/data/base/test_parse_units/not_dict.json'
+    invalid_units_file = (
+        'pelicun/tests/basic/data/base/test_parse_units/not_dict.json'
+    )
     with pytest.raises(ValueError):
         units = base.parse_units(invalid_units_file)
 

pelicun/tests/compatibility/PRJ-3411v5/test_compatibility_prj3411v5.py

@@ -159,7 +159,7 @@ def test_compatibility_DesignSafe_PRJ_3411_Example01():
 
     P58_data_for_this_assessment = P58_data.loc[
         loss_map['BldgRepair'].values[:-2], :
-        ]
+    ]
 
     additional_consequences = pd.DataFrame(
         columns=pd.MultiIndex.from_tuples(
@@ -189,7 +189,10 @@ def test_compatibility_DesignSafe_PRJ_3411_Example01():
 
     with pytest.warns(PelicunWarning):
         PAL.bldg_repair.load_model(
-            [additional_consequences, "PelicunDefault/bldg_repair_DB_FEMA_P58_2nd.csv"],
+            [
+                additional_consequences,
+                "PelicunDefault/bldg_repair_DB_FEMA_P58_2nd.csv",
+            ],
             loss_map,
         )
 

pelicun/tools/DL_calculation.py

@@ -1138,7 +1138,7 @@ def run_pelicun(
                 )
 
         # calculate damages
-        PAL.damage.calculate(sample_size, dmg_process=dmg_process)
+        PAL.damage.calculate(dmg_process=dmg_process)
 
         # if requested, save results
         if 'Damage' in config['DL']['Outputs']:
@@ -1622,7 +1622,7 @@ def run_pelicun(
                 decision_variables=DV_list,
             )
 
-            PAL.repair.calculate(sample_size)
+            PAL.repair.calculate()
 
             agg_repair = PAL.repair.aggregate_losses()