Revert branch contents to eaaa063

Author: jmythms

.github/workflows/tests.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.x'
       - name: Install scout package
         run: |
           python -m pip install --upgrade pip

pyproject.toml

@@ -20,25 +20,25 @@ authors = [
 requires-python = ">=3.10"
 license = {file = "LICENSE.md"}
 dependencies = [
-  "pandas == 2.3.3",
-  "numpy == 1.26.4",
-  "scipy == 1.15.3",
-  "requests == 2.32.5",
-  "numpy-financial == 1.0.0",
-  "xlsxwriter == 3.2.9",
-  "matplotlib == 3.10.8",
-  "backoff == 2.2.1",
-  "python-dotenv == 1.2.1",
-  "pyyaml == 6.0.3",
-  "jsonschema == 4.25.1",
-  "pytest == 9.0.2"
+    "pandas >= 2.0",
+    "numpy >= 1.16, <2.0",
+    "scipy",
+    "requests",
+    "numpy-financial",
+    "xlsxwriter",
+    "matplotlib",
+    "backoff",
+    "python-dotenv",
+    "pyyaml",
+    "jsonschema",
+    "pytest"
 ]
 
 [tool.setuptools_scm]
 
 [project.optional-dependencies]
 dev = [
-  "openpyxl == 3.1.5",
-  "flake8 == 7.3.0",
-  "tabulate == 0.9.0",
+    "openpyxl",
+    "flake8 >= 7.0",
+    "tabulate",
 ]

scout/config.py

@@ -10,7 +10,8 @@
 
 
 class LogConfig:
-    """Configure the logger"""
+    """Configure the logger
+    """
 
     @staticmethod
     def configure_logging():

scout/ecm_prep.py

@@ -13,8 +13,8 @@
 import numpy_financial as npf
 from datetime import datetime
 from scout.plots import run_plot
-from scout.config import Config, FilePaths as fp
-from scout.utils import PrintFormat as fmt
+from scout.config import FilePaths as fp
+from scout.config import Config
 import warnings
 import itertools
 import pandas as pd
@@ -5906,14 +5906,15 @@ def out_break_walk_subtr(self, orig_dict, base_val, eff_val, focus_yrs):
                 del orig_dict[k]
         return orig_dict
 
-    def process_codes_bps(self, opts, adopt_scheme, msegs, handyvars, trim_yrs,
+    def process_codes_bps(self, adopt_scheme, msegs, handyvars, verboseprint, trim_yrs,
                           code_comply_res, code_comply_com, bps_comply_res, bps_comply_com):
         """Read in and apply the effects of codes/BPS to measure stock/energy/carbon/energy costs.
 
         Args:
             adopt_scheme (string): Assumed consumer adoption scenario.
             msegs: Baseline stock, energy, and square footage data for building microsegments.
             handyvars (object): Global variables useful across class methods.
+            verboseprint (function): Print verbose messages with user option.
             trim_yrs (list): Optional list of years to focus results on.
             code_comply_res (float): Compliance rate to assume for residential codes.
             code_comply_com (float): Compliance rate to assume for commercial codes.
@@ -6115,12 +6116,10 @@ def process_codes_bps(self, opts, adopt_scheme, msegs, handyvars, trim_yrs,
                             "electric"][var].keys()} for var in [
                             "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")
+                    verboseprint(
+                        ("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. "))
                 # 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,
@@ -7366,6 +7365,9 @@ def main(opts: argparse.NameSpace):  # noqa: F821
         of key results to an output JSON.
     """
 
+    # Set function that only prints message when in verbose mode
+    verboseprint = print if opts.verbose else lambda *a, **k: None
+
     # Raise numpy errors as exceptions
     numpy.seterr('raise')
     # Initialize user opts variable (elements: S-S calculation method;
@@ -7632,7 +7634,7 @@ def main(opts: argparse.NameSpace):  # noqa: F821
                 m.markets["Technical potential"]["uncompeted"]["mseg_adjust"] = \
                     meas_comp_data["Technical potential"]
             # Print data import message for each ECM if in verbose mode
-            fmt.verboseprint(opts.verbose, f"Imported ECM {m.name} competition data", "info")
+            verboseprint("Imported ECM '" + m.name + "' competition data")
 
         # Import total absolute heating and cooling energy use data, used in
         # removing overlaps between supply-side and demand-side heating/cooling
@@ -7697,7 +7699,7 @@ def main(opts: argparse.NameSpace):  # noqa: F821
             print("Post-processing impacts of state-level codes and/or performance standards...",
                   end="", flush=True)
             cbpslist = a_run.process_codes_bps(
-                opts, adopt_scheme, msegs, handyvars, trim_yrs,
+                adopt_scheme, msegs, handyvars, verboseprint, trim_yrs,
                 code_comply_res, code_comply_com, bps_comply_res, bps_comply_com)
             print("Calculations complete")
         elif any([x is not None and len(x) != 0 for x in [codes, bps]]):
@@ -7769,12 +7771,12 @@ def main(opts: argparse.NameSpace):  # noqa: F821
     try:
         elec_carb = elec_cost_carb['CO2 intensity of electricity']['data']
         elec_cost = elec_cost_carb['End-use electricity price']['data']
-        format_data = True  # Boolean for indicating data key substructure
+        fmt = True  # Boolean for indicating data key substructure
     except KeyError:
         # Data are structured as in the site_source_co2_conversions files
         elec_carb = elec_cost_carb['electricity']['CO2 intensity']['data']
         elec_cost = elec_cost_carb['electricity']['price']['data']
-        format_data = False
+        fmt = False
 
     # Determine regions and building types used by active measures for
     # aggregating onsite generation data
@@ -7814,7 +7816,7 @@ def variable_depth_dict(): return defaultdict(variable_depth_dict)
             else:
                 bt_bin = 'commercial'
             # Get CO2 intensity and electricity cost data and convert units
-            if format_data:  # Data (and data structure) from emm_region files
+            if fmt:  # Data (and data structure) from emm_region files
                 # Convert Mt/TWh to Mt/MMBtu
                 carbtmp = {k: elec_carb[cz].get(k, 0)/3.41214e6
                            for k in elec_carb[cz].keys()}

scout/ecm_prep_vars.py

@@ -2,8 +2,7 @@
 from pathlib import Path
 from scout.config import LogConfig, Config, FilePaths as fp
 from scout.ecm_prep_args import ecm_args
-from scout.ecm_prep import ECMPrepHelper, main as ecm_prep_main
-from scout.utils import JsonIO
+from scout.ecm_prep import Utils, main as ecm_prep_main
 from scout import run
 from argparse import ArgumentParser
 import logging
@@ -123,23 +122,20 @@ def run_batch(self):
             ecm_prep_main(ecm_prep_opts)
 
             # Run run.main() for each yml in the group, set custom results directories
-            run_setup = JsonIO.load_json(fp.GENERATED / "run_setup.json")
+            run_setup = Utils.load_json(fp.GENERATED / "run_setup.json")
             # Find subset of ECMs that were set to inactive or skipped in the prep run
             inactive_skipped_ecms = run_setup["inactive"] + run_setup["skipped"]
             ecm_files_list = self.get_ecm_files(yml_grp)
             for ct, config in enumerate(yml_grp):
                 # Set all ECMs inactive
-                run_setup = ECMPrepHelper.update_active_measures(
-                    run_setup,
-                    to_inactive=ecm_prep_opts.ecm_files
-                )
-                # Set yml-specific ECMs active
+                run_setup = Utils.update_active_measures(run_setup,
+                                                         to_inactive=ecm_prep_opts.ecm_files)
                 # Find yml-specific individual ECMs not marked inactive or skipped
                 active_ecms = [ecm for ecm in ecm_files_list[ct] if
                                ecm not in inactive_skipped_ecms]
                 # Set yml-specific ECMs not marked inactive or skipped active
-                run_setup = ECMPrepHelper.update_active_measures(run_setup, to_active=active_ecms)
-                JsonIO.dump_json(run_setup, fp.GENERATED / "run_setup.json")
+                run_setup = Utils.update_active_measures(run_setup, to_active=active_ecms)
+                Utils.dump_json(run_setup, fp.GENERATED / "run_setup.json")
                 run_opts = self.get_run_opts(config)
                 logger.info(f"Running run.py for {config}")
                 run.main(run_opts)