Cleanup from rebase, address linter errors

Author: aspeake

scout/# Append updated competition data from.py

@@ -359,12 +359,9 @@ def split_clean_data(meas_prepped_objs, full_dat_out):
                 if not isinstance(m, MeasurePackage):
                     del m.markets[adopt_scheme]["mseg_adjust"][
                         "paired heat/cool mseg adjustments"]
-                # Add remaining contributing microsegment data to
-                # competition data dict, if the adoption scenario will be competed
-                # in the run.py module, then delete from measure
+                # Add fuel splits and sector shape data, if applicable and the adoption scenario
+                # will be competed in the run.py module, then delete from measure
                 if full_dat_out[adopt_scheme]:
-                    comp_data_dict[adopt_scheme] = \
-                        m.markets[adopt_scheme]["mseg_adjust"]
                     # If applicable, add efficient fuel split data to fuel split
                     # data dict
                     if len(m.eff_fs_splt[adopt_scheme].keys()) != 0:
@@ -380,6 +377,9 @@ def split_clean_data(meas_prepped_objs, full_dat_out):
                     # If adoption scenario will not be competed in the run.py
                     # module, remove detailed mseg breakouts
                     del m.markets[adopt_scheme]["mseg_out_break"]
+                # Add remaining contributing microsegment data to competition data dict, then
+                # delete from measure
+                comp_data_dict[adopt_scheme] = m.markets[adopt_scheme]["mseg_adjust"]
                 del m.markets[adopt_scheme]["mseg_adjust"]
             # Delete info. about efficient fuel splits for fuel switch measures
             del m.eff_fs_splt
@@ -10336,7 +10336,8 @@ def breakout_mseg(self, mskeys, contrib_mseg_key, adopt_scheme, opts, input_data
                 fuel->end use->technology type->structure type).
             adopt_scheme (string): Assumed consumer adoption scenario.
             opts (object): Stores user-specified execution options.
-            input_data (list): Stores all mseg-specific data that need to be assigned to breakouts.
+            input_data (list): Stores all segment-specific data that need to be assigned to
+                breakouts.
             gap_adj_frac (float): Fraction to apply to breakout data to represent
                 portions of msegs that are not covered by ComStock load shapes (if applicable)
         Returns:

scout/ecm_prep.py

@@ -3,11 +3,11 @@
 import copy
 import itertools
 import numpy
+import pandas as pd
 from datetime import datetime
 from collections import OrderedDict
 from scout.utils import JsonIO
 from scout.config import FilePaths as fp
-import pandas as pd
 
 
 class UsefulVars(object):

scout/ecm_prep_vars.py

@@ -6116,10 +6116,11 @@ def process_codes_bps(self, opts, adopt_scheme, msegs, handyvars, trim_yrs,
                             "stock", "energy", "carbon", "cost"]}
                 except ValueError:
                     fmt.verboseprint(opts.verbose,
-                        ("No measures flagged as basis for setting relative efficiency of "
-                         "electric equipment for current region and building type. Setting "
-                         "relative efficiency of conversion to 1 across end uses and proceeding.",
-                         "warning"))
+                                     ("No measures flagged as basis for setting relative "
+                                      "efficiency of electric equipment for current region and "
+                                      "building type. Setting relative efficiency of conversion "
+                                      "to 1 across end uses and proceeding."),
+                                     "warning")
                 # Adjust onsite reduction frac. times apply frac. to account for overlaps
                 onsite_frac_already_in_place, onsite_times_apply_fracs = self.stack_impacts(
                     code_std_flag, reg, bldg, regu_type, onsite_frac_already_in_place,

scout/run.py

@@ -28951,8 +28951,8 @@ def test_code_bps_postprocess(self):
                                      brkout="basic")
         # Shorthand for the code/BPS measure objects that are generated via the tested function
         code_bps_meas_out = a_run_codes_bps.process_codes_bps(
-            self.test_adopt_scheme_code_bps, self.sample_msegs_sf_data, self.hv_code_bps,
-            verboseprint=None, trim_yrs=False, code_comply_res=1, code_comply_com=1,
+            self.opts, self.test_adopt_scheme_code_bps, self.sample_msegs_sf_data, self.hv_code_bps,
+            trim_yrs=False, code_comply_res=1, code_comply_com=1,
             bps_comply_res=1, bps_comply_com=1)
 
         # Check the outputs of all measures